Skip to content

Commit a30b3a5

Browse files
authored
Merge pull request #494 from puppetlabs/release-prep
Release prep v6.3.0
2 parents 2659b06 + fd9e24c commit a30b3a5

File tree

3 files changed

+89
-5
lines changed

3 files changed

+89
-5
lines changed

CHANGELOG.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
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).
44

5+
## [v6.3.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.3.0) (2022-09-12)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.2.0...v6.3.0)
8+
9+
### Added
10+
11+
- pdksync - \(GH-cat-11\) Certify Support for Ubuntu 22.04 [\#493](https://github.com/puppetlabs/puppetlabs-tomcat/pull/493) ([david22swan](https://github.com/david22swan))
12+
- pdksync - \(GH-cat-12\) Add Support for Redhat 9 [\#492](https://github.com/puppetlabs/puppetlabs-tomcat/pull/492) ([david22swan](https://github.com/david22swan))
13+
- Allow usage of Context/Resources [\#491](https://github.com/puppetlabs/puppetlabs-tomcat/pull/491) ([tuxmea](https://github.com/tuxmea))
14+
515
## [v6.2.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.2.0) (2022-05-16)
616

717
[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
1121
- Update puppet-archive dependency [\#477](https://github.com/puppetlabs/puppetlabs-tomcat/pull/477) ([h4l](https://github.com/h4l))
1222
- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#476](https://github.com/puppetlabs/puppetlabs-tomcat/pull/476) ([david22swan](https://github.com/david22swan))
1323
- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#475](https://github.com/puppetlabs/puppetlabs-tomcat/pull/475) ([david22swan](https://github.com/david22swan))
14-
- pdksync - \(MAINT\) - Add Labeller and Stale GHA Workflows [\#481](https://github.com/puppetlabs/puppetlabs-tomcat/pull/481) ([chelnak](https://github.com/chelnak))
1524

1625
### Fixed
1726

18-
- pdk - \(MAINT\) - Update PDK [\#488](https://github.com/puppetlabs/puppetlabs-tomcat/pull/488) ([david22swan](https://github.com/david22swan))
19-
- pdksync - \(MAINT\) - Update Labeller Trigger [\#486](https://github.com/puppetlabs/puppetlabs-tomcat/pull/486) ([chelnak](https://github.com/chelnak))
20-
- 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))
2127
- 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))
2228
- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#478](https://github.com/puppetlabs/puppetlabs-tomcat/pull/478) ([david22swan](https://github.com/david22swan))
2329
- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#474](https://github.com/puppetlabs/puppetlabs-tomcat/pull/474) ([david22swan](https://github.com/david22swan))

REFERENCE.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* [`tomcat::config::context::parameter`](#tomcatconfigcontextparameter): Configure Parameter elements in $CATALINA_BASE/conf/context.xml.
1919
* [`tomcat::config::context::resource`](#tomcatconfigcontextresource): Configure Resource elements in $CATALINA_BASE/conf/context.xml
2020
* [`tomcat::config::context::resourcelink`](#tomcatconfigcontextresourcelink): Configure a ResourceLink element in the designated xml config.
21+
* [`tomcat::config::context::resources`](#tomcatconfigcontextresources): Configure Resources elements in $CATALINA_BASE/conf/context.xml
2122
* [`tomcat::config::context::valve`](#tomcatconfigcontextvalve): Specifies Valve elements in `${catalina_base}/conf/context.xml`
2223
* [`tomcat::config::properties::property`](#tomcatconfigpropertiesproperty): Manage additional entries for the properties file, typically catalina.properties
2324
* [`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
566567

567568
Default value: ``true``
568569

570+
### <a name="tomcatconfigcontextresources"></a>`tomcat::config::context::resources`
571+
572+
Configure Resources elements in $CATALINA_BASE/conf/context.xml
573+
574+
#### Parameters
575+
576+
The following parameters are available in the `tomcat::config::context::resources` defined type:
577+
578+
* [`ensure`](#ensure)
579+
* [`resources_name`](#resources_name)
580+
* [`name`](#name)
581+
* [`resources_type`](#resources_type)
582+
* [`catalina_base`](#catalina_base)
583+
* [`additional_attributes`](#additional_attributes)
584+
* [`attributes_to_remove`](#attributes_to_remove)
585+
* [`show_diff`](#show_diff)
586+
587+
##### <a name="ensure"></a>`ensure`
588+
589+
Data type: `Enum['present','absent']`
590+
591+
Specifies whether you are trying to add or remove the Resources element.
592+
593+
Default value: `'present'`
594+
595+
##### <a name="resources_name"></a>`resources_name`
596+
597+
Data type: `Any`
598+
599+
The name of the Resources to be created, relative to the `java:comp/env` context. `$name`.
600+
601+
Default value: `$name`
602+
603+
##### <a name="name"></a>`name`
604+
605+
`$resources_name`
606+
607+
##### <a name="resources_type"></a>`resources_type`
608+
609+
Data type: `Any`
610+
611+
The fully qualified Java class name expected by the web application when it performs a lookup for this resources. Required to create the resource.
612+
613+
Default value: ``undef``
614+
615+
##### <a name="catalina_base"></a>`catalina_base`
616+
617+
Data type: `Any`
618+
619+
Specifies the root of the Tomcat installation.
620+
621+
Default value: `$::tomcat::catalina_home`
622+
623+
##### <a name="additional_attributes"></a>`additional_attributes`
624+
625+
Data type: `Hash`
626+
627+
Specifies any additional attributes to add to the Valve. Should be a hash of the format 'attribute' => 'value'. Optional
628+
629+
Default value: `{}`
630+
631+
##### <a name="attributes_to_remove"></a>`attributes_to_remove`
632+
633+
Data type: `Array`
634+
635+
Specifies an array of attributes to remove from the element. Valid options: an array of strings. `[]`.
636+
637+
Default value: `[]`
638+
639+
##### <a name="show_diff"></a>`show_diff`
640+
641+
Data type: `Boolean`
642+
643+
Specifies display differences when augeas changes files, defaulting to true. Valid options: true or false.
644+
645+
Default value: ``true``
646+
569647
### <a name="tomcatconfigcontextvalve"></a>`tomcat::config::context::valve`
570648

571649
Specifies Valve elements in `${catalina_base}/conf/context.xml`

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-tomcat",
3-
"version": "6.2.0",
3+
"version": "6.3.0",
44
"author": "puppetlabs",
55
"summary": "Installs, deploys, and configures Apache Tomcat web services.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)