Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## [v6.1.0](https://github.com/puppetlabs/puppetlabs-java_ks/tree/v6.1.0) - 2026-09-23

[Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/v6.0.0...v6.1.0)

### Added

- Make keytool path configureable [#477](https://github.com/puppetlabs/puppetlabs-java_ks/pull/477) ([bastelfreak](https://github.com/bastelfreak))

## [v6.0.0](https://github.com/puppetlabs/puppetlabs-java_ks/tree/v6.0.0) - 2026-09-16

[Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/v5.1.1...v6.0.0)
Expand Down
7 changes: 7 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ The following parameters are available in the `java_ks` type.
* [`certificate_content`](#-java_ks--certificate_content)
* [`chain`](#-java_ks--chain)
* [`destkeypass`](#-java_ks--destkeypass)
* [`keytool`](#-java_ks--keytool)
* [`keytool_timeout`](#-java_ks--keytool_timeout)
* [`name`](#-java_ks--name)
* [`password_fail_reset`](#-java_ks--password_fail_reset)
Expand Down Expand Up @@ -103,6 +104,12 @@ from a file separate from the server certificate. This will autorequire the spec

The password used to protect the key in keystore.

##### <a name="-java_ks--keytool"></a>`keytool`

Path to the keytool executable used by the provider.

Default value: `keytool`

##### <a name="-java_ks--keytool_timeout"></a>`keytool_timeout`

Timeout for the keytool command in seconds.
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-java_ks",
"version": "6.0.0",
"version": "6.1.0",
"author": "puppetlabs",
"summary": "Manage arbitrary Java keystore files",
"license": "Apache-2.0",
Expand Down
Loading