Merge pull request #2574 from puppetlabs/release-prep

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

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`
 

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",