From 9886f201896b2c19a8c03b5aaebdba2dca3b5e1e Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Tue, 19 Sep 2023 10:49:40 +0200 Subject: [PATCH] Fix wrong parameter data type of ssl in feature::api class --- CHANGELOG.md | 7 +++++++ REFERENCE.md | 6 +++--- manifests/feature/api.pp | 6 +++--- metadata.json | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df3a8c2c..21114955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [v4.1.1](https://github.com/icinga/puppet-icinga2/tree/v4.1.1) (2023-09-19) +[Full Changelog](https://github.com/icinga/puppet-icinga2/compare/v4.1.0...v4.1.1) + +**Fixed bugs:** + +- fix test of empty array for environments parameter in query\_objects [\#742](https://github.com/Icinga/puppet-icinga2/pull/742) ([lbetz](https://github.com/lbetz)) + ## [v4.1.0](https://github.com/icinga/puppet-icinga2/tree/v4.1.0) (2023-09-14) [Full Changelog](https://github.com/icinga/puppet-icinga2/compare/v4.0.1...v4.1.0) diff --git a/REFERENCE.md b/REFERENCE.md index 141be7dd..e948f43e 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -435,7 +435,7 @@ Default value: `'icinga2'` ##### `ssl_key` -Data type: `Optional[Stdlib::Base64]` +Data type: `Optional[String]` The private key in a base64 encoded string to store in cert directory. This parameter requires pki to be set to 'none'. @@ -444,7 +444,7 @@ Default value: `undef` ##### `ssl_cert` -Data type: `Optional[Stdlib::Base64]` +Data type: `Optional[String]` The certificate in a base64 encoded string to store in cert directory This parameter requires pki to be set to 'none'. @@ -453,7 +453,7 @@ Default value: `undef` ##### `ssl_cacert` -Data type: `Optional[Stdlib::Base64]` +Data type: `Optional[String]` The CA root certificate in a base64 encoded string to store in cert directory. This parameter requires pki to be set to 'none'. diff --git a/manifests/feature/api.pp b/manifests/feature/api.pp index 9e360195..8cc33e39 100644 --- a/manifests/feature/api.pp +++ b/manifests/feature/api.pp @@ -162,9 +162,9 @@ Optional[Variant[String, Sensitive[String]]] $ticket_id = undef, Hash[String, Hash] $endpoints = { 'NodeName' => {} }, Hash[String, Hash] $zones = { 'ZoneName' => { endpoints => ['NodeName'] } }, - Optional[Stdlib::Base64] $ssl_key = undef, - Optional[Stdlib::Base64] $ssl_cert = undef, - Optional[Stdlib::Base64] $ssl_cacert = undef, + Optional[String] $ssl_key = undef, + Optional[String] $ssl_cert = undef, + Optional[String] $ssl_cacert = undef, Optional[Enum['TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3']] $ssl_protocolmin = undef, Optional[Icinga2::Interval] $ssl_handshake_timeout = undef, Optional[Icinga2::Interval] $connect_timeout = undef, diff --git a/metadata.json b/metadata.json index c0267468..be565352 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "icinga-icinga2", - "version": "4.1.0", + "version": "4.1.1", "author": "Icinga Development Team", "summary": "Icinga 2 Puppet Module", "license": "Apache-2.0",