diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a88f609..d672407c 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.3.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.3.0) (2022-09-12) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.2.0...v6.3.0) + +### Added + +- pdksync - \(GH-cat-11\) Certify Support for Ubuntu 22.04 [\#493](https://github.com/puppetlabs/puppetlabs-tomcat/pull/493) ([david22swan](https://github.com/david22swan)) +- pdksync - \(GH-cat-12\) Add Support for Redhat 9 [\#492](https://github.com/puppetlabs/puppetlabs-tomcat/pull/492) ([david22swan](https://github.com/david22swan)) +- Allow usage of Context/Resources [\#491](https://github.com/puppetlabs/puppetlabs-tomcat/pull/491) ([tuxmea](https://github.com/tuxmea)) + ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.2.0) (2022-05-16) [Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.1.0...v6.2.0) @@ -11,13 +21,9 @@ All notable changes to this project will be documented in this file. The format - Update puppet-archive dependency [\#477](https://github.com/puppetlabs/puppetlabs-tomcat/pull/477) ([h4l](https://github.com/h4l)) - pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#476](https://github.com/puppetlabs/puppetlabs-tomcat/pull/476) ([david22swan](https://github.com/david22swan)) - pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#475](https://github.com/puppetlabs/puppetlabs-tomcat/pull/475) ([david22swan](https://github.com/david22swan)) -- pdksync - \(MAINT\) - Add Labeller and Stale GHA Workflows [\#481](https://github.com/puppetlabs/puppetlabs-tomcat/pull/481) ([chelnak](https://github.com/chelnak)) ### Fixed -- pdk - \(MAINT\) - Update PDK [\#488](https://github.com/puppetlabs/puppetlabs-tomcat/pull/488) ([david22swan](https://github.com/david22swan)) -- pdksync - \(MAINT\) - Update Labeller Trigger [\#486](https://github.com/puppetlabs/puppetlabs-tomcat/pull/486) ([chelnak](https://github.com/chelnak)) -- pdksync - \(GH-C&T-7\) - Remove code specific to unsupported OSs [\#482](https://github.com/puppetlabs/puppetlabs-tomcat/pull/482) ([david22swan](https://github.com/david22swan)) - pdksync - \(GH-iac-334\) Remove Support for Ubuntu 14.04/16.04 [\#480](https://github.com/puppetlabs/puppetlabs-tomcat/pull/480) ([david22swan](https://github.com/david22swan)) - pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#478](https://github.com/puppetlabs/puppetlabs-tomcat/pull/478) ([david22swan](https://github.com/david22swan)) - pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#474](https://github.com/puppetlabs/puppetlabs-tomcat/pull/474) ([david22swan](https://github.com/david22swan)) diff --git a/REFERENCE.md b/REFERENCE.md index 12540b26..ea3cc375 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -18,6 +18,7 @@ * [`tomcat::config::context::parameter`](#tomcatconfigcontextparameter): Configure Parameter elements in $CATALINA_BASE/conf/context.xml. * [`tomcat::config::context::resource`](#tomcatconfigcontextresource): Configure Resource elements in $CATALINA_BASE/conf/context.xml * [`tomcat::config::context::resourcelink`](#tomcatconfigcontextresourcelink): Configure a ResourceLink element in the designated xml config. +* [`tomcat::config::context::resources`](#tomcatconfigcontextresources): Configure Resources elements in $CATALINA_BASE/conf/context.xml * [`tomcat::config::context::valve`](#tomcatconfigcontextvalve): Specifies Valve elements in `${catalina_base}/conf/context.xml` * [`tomcat::config::properties::property`](#tomcatconfigpropertiesproperty): Manage additional entries for the properties file, typically catalina.properties * [`tomcat::config::server`](#tomcatconfigserver): Configure attributes for the Server element in $CATALINA_BASE/conf/server.xml @@ -566,6 +567,83 @@ Specifies display differences when augeas changes files, defaulting to true. Val Default value: ``true`` +### `tomcat::config::context::resources` + +Configure Resources elements in $CATALINA_BASE/conf/context.xml + +#### Parameters + +The following parameters are available in the `tomcat::config::context::resources` defined type: + +* [`ensure`](#ensure) +* [`resources_name`](#resources_name) +* [`name`](#name) +* [`resources_type`](#resources_type) +* [`catalina_base`](#catalina_base) +* [`additional_attributes`](#additional_attributes) +* [`attributes_to_remove`](#attributes_to_remove) +* [`show_diff`](#show_diff) + +##### `ensure` + +Data type: `Enum['present','absent']` + +Specifies whether you are trying to add or remove the Resources element. + +Default value: `'present'` + +##### `resources_name` + +Data type: `Any` + +The name of the Resources to be created, relative to the `java:comp/env` context. `$name`. + +Default value: `$name` + +##### `name` + +`$resources_name` + +##### `resources_type` + +Data type: `Any` + +The fully qualified Java class name expected by the web application when it performs a lookup for this resources. Required to create the resource. + +Default value: ``undef`` + +##### `catalina_base` + +Data type: `Any` + +Specifies the root of the Tomcat installation. + +Default value: `$::tomcat::catalina_home` + +##### `additional_attributes` + +Data type: `Hash` + +Specifies any additional attributes to add to the Valve. Should be a hash of the format 'attribute' => 'value'. Optional + +Default value: `{}` + +##### `attributes_to_remove` + +Data type: `Array` + +Specifies an array of attributes to remove from the element. Valid options: an array of strings. `[]`. + +Default value: `[]` + +##### `show_diff` + +Data type: `Boolean` + +Specifies display differences when augeas changes files, defaulting to true. Valid options: true or false. + +Default value: ``true`` + ### `tomcat::config::context::valve` Specifies Valve elements in `${catalina_base}/conf/context.xml` diff --git a/metadata.json b/metadata.json index 046ac3fe..0508f04b 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-tomcat", - "version": "6.2.0", + "version": "6.3.0", "author": "puppetlabs", "summary": "Installs, deploys, and configures Apache Tomcat web services.", "license": "Apache-2.0",