Merge pull request puppetlabs#2159 from puppetlabs/release

Release version 6.3.0

Author: pmcmaw

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)
 

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`.

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