Skip to content

Commit

Permalink
Merge pull request #640 from Icinga/enhancement/change-data-types-of-…
Browse files Browse the repository at this point in the history 
…all-certs-and-keys-623

fix #623 change data types of all certificates and keys
  • Loading branch information
@lbetz
lbetz authored Oct 6, 2020
2 parents f7b1fc6 + 7d4a0d7 commit 579c138
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions manifests/feature/api.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
# - none: Does nothing and you either have to manage the files yourself as file resources
# or use the ssl_key, ssl_cert, ssl_cacert parameters.
#
# @param [Optional[String]] ssl_key
# @param [Optional[Stdlib::Base64]] ssl_key
# The private key in a base64 encoded string to store in cert directory. This parameter
# requires pki to be set to 'none'.
#
# @param [Optional[String]] ssl_cert
# @param [Optional[Stdlib::Base64]] ssl_cert
# The certificate in a base64 encoded string to store in cert directory This parameter
# requires pki to be set to 'none'.
#
# @param [Optional[String]] ssl_cacert
# @param [Optional[Stdlib::Base64]] ssl_cacert
# The CA root certificate in a base64 encoded string to store in cert directory. This parameter
# requires pki to be set to 'none'.
#
Expand Down Expand Up @@ -157,9 +157,9 @@
Optional[String] $ticket_id = undef,
Hash[String, Hash] $endpoints = { 'NodeName' => {} },
Hash[String, Hash] $zones = { 'ZoneName' => { endpoints => [ 'NodeName' ] } },
Optional[String] $ssl_key = undef,
Optional[String] $ssl_cert = undef,
Optional[String] $ssl_cacert = undef,
Optional[Stdlib::Base64] $ssl_key = undef,
Optional[Stdlib::Base64] $ssl_cert = undef,
Optional[Stdlib::Base64] $ssl_cacert = undef,
Optional[Enum['TLSv1', 'TLSv1.1', 'TLSv1.2']] $ssl_protocolmin = undef,
Optional[Icinga2::Interval] $ssl_handshake_timeout = undef,
Optional[String] $ssl_cipher_list = undef,
Expand Down
12 changes: 6 additions & 6 deletions manifests/feature/elasticsearch.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
# @param [Optional[Stdlib::Absolutepath]] ssl_cacert_path
# Location of the CA certificate.
#
# @param [Optional[String]] ssl_key
# @param [Optional[Stdlib::Base64]] ssl_key
# The private key in a base64 encoded string to store in spicified ssl_key_path file.
#
# @param [Optional[String]] ssl_cert
# @param [Optional[Stdlib::Base64]] ssl_cert
# The certificate in a base64 encoded to store in spicified ssl_cert_path file.
#
# @param [Optional[String]] ssl_cacert
# @param [Optional[Stdlib::Base64]] ssl_cacert
# The CA root certificate in a base64 encoded string to store in spicified ssl_cacert_path file.
#
# @param [Optional[Boolean]] enable_send_perfdata
Expand All @@ -69,9 +69,9 @@
Optional[Stdlib::Absolutepath] $ssl_key_path = undef,
Optional[Stdlib::Absolutepath] $ssl_cert_path = undef,
Optional[Stdlib::Absolutepath] $ssl_cacert_path = undef,
Optional[String] $ssl_key = undef,
Optional[String] $ssl_cert = undef,
Optional[String] $ssl_cacert = undef,
Optional[Stdlib::Base64] $ssl_key = undef,
Optional[Stdlib::Base64] $ssl_cert = undef,
Optional[Stdlib::Base64] $ssl_cacert = undef,
Optional[Boolean] $enable_send_perfdata = undef,
Optional[Icinga2::Interval] $flush_interval = undef,
Optional[Integer] $flush_threshold = undef,
Expand Down
12 changes: 6 additions & 6 deletions manifests/feature/idomysql.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
# @param [Optional[Stdlib::Absolutepath]] ssl_cacert_path
# Location of the CA certificate. Only valid if ssl is enabled.
#
# @param [Optional[String]] ssl_key
# @param [Optional[Stdlib::Base64]] ssl_key
# The private key in a base64 encoded string to store in spicified ssl_key_path file.
# Only valid if ssl is enabled.
#
# @param [Optional[String]] ssl_cert
# @param [Optional[tdlib::Base64]] ssl_cert
# The certificate in a base64 encoded string to store in spicified ssl_cert_path file.
# Only valid if ssl is enabled.
#
# @param [Optional[String]] ssl_cacert
# @param [Optional[tdlib::Base64]] ssl_cacert
# The CA root certificate in a base64 encoded string to store in spicified ssl_cacert_path file.
# Only valid if ssl is enabled.
#
Expand Down Expand Up @@ -106,9 +106,9 @@
Optional[Stdlib::Absolutepath] $ssl_key_path = undef,
Optional[Stdlib::Absolutepath] $ssl_cert_path = undef,
Optional[Stdlib::Absolutepath] $ssl_cacert_path = undef,
Optional[String] $ssl_key = undef,
Optional[String] $ssl_cert = undef,
Optional[String] $ssl_cacert = undef,
Optional[Stdlib::Base64] $ssl_key = undef,
Optional[Stdlib::Base64] $ssl_cert = undef,
Optional[Stdlib::Base64] $ssl_cacert = undef,
Optional[Stdlib::Absolutepath] $ssl_capath = undef,
Optional[String] $ssl_cipher = undef,
Optional[String] $table_prefix = undef,
Expand Down
12 changes: 6 additions & 6 deletions manifests/feature/influxdb.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
# @param [Optional[Stdlib::Absolutepath]] ssl_cacert_path
# Location of the CA certificate.
#
# @param [Optional[String]] ssl_key
# @param [Optional[Stdlib::Base64]] ssl_key
# The private key in a base64 encoded string to store in ssl_key_path file.
#
# @param [Optional[String]] ssl_cert
# @param [Optional[Stdlib::Base64]] ssl_cert
# The certificate in a base64 encoded string to store in ssl_cert_path file.
#
# @param [Optional[String]] ssl_cacert
# @param [Optional[Sdlib::Base64]] ssl_cacert
# The CA root certificate in a base64 encoded to store in ssl_cacert_path file.
#
# @param [String] host_measurement
Expand Down Expand Up @@ -86,9 +86,9 @@
Optional[Stdlib::Absolutepath] $ssl_key_path = undef,
Optional[Stdlib::Absolutepath] $ssl_cert_path = undef,
Optional[Stdlib::Absolutepath] $ssl_cacert_path = undef,
Optional[String] $ssl_key = undef,
Optional[String] $ssl_cert = undef,
Optional[String] $ssl_cacert = undef,
Optional[Stdlib::Base64] $ssl_key = undef,
Optional[Stdlib::Base64] $ssl_cert = undef,
Optional[Stdlib::Base64] $ssl_cacert = undef,
String $host_measurement = '$host.check_command$',
Hash $host_tags = { hostname => '$host.name$' },
String $service_measurement = '$service.check_command$',
Expand Down

0 comments on commit 579c138

Please sign in to comment.