[icinga-checkins] icinga.org: puppet-icinga2/feature/testing: feature/api: Add cipher_list and tls_protocolmin

git at icinga.org git at icinga.org
Wed Dec 7 11:44:21 CET 2016


Module: puppet-icinga2
Branch: feature/testing
Commit: 0e7319f7277c720bb5f3015ce4047751445dc8fa
URL:    https://git.icinga.org/?p=puppet-icinga2.git;a=commit;h=0e7319f7277c720bb5f3015ce4047751445dc8fa

Author: Markus Frosch <markus.frosch at icinga.com>
Date:   Wed Dec  7 11:44:15 2016 +0100

feature/api: Add cipher_list and tls_protocolmin

---

 manifests/feature/api.pp       |    2 ++
 templates/feature/api.conf.erb |    7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/manifests/feature/api.pp b/manifests/feature/api.pp
index 643d319..1587628 100644
--- a/manifests/feature/api.pp
+++ b/manifests/feature/api.pp
@@ -18,6 +18,8 @@ class icinga2::feature::api (
   $hostname        = $::fqdn,
   $manage_zone     = true,
   $parent_zone     = undef,
+  $cipher_list     = undef,
+  $tls_protocolmin = undef,
 ) {
 
   validate_bool($accept_commands)
diff --git a/templates/feature/api.conf.erb b/templates/feature/api.conf.erb
index 15b5b82..bd68d8c 100644
--- a/templates/feature/api.conf.erb
+++ b/templates/feature/api.conf.erb
@@ -18,4 +18,11 @@ object ApiListener "api" {
   <%- if @ticket_salt -%>
   ticket_salt = TicketSalt
   <%- end -%>
+
+  <%- if @cipher_list -%>
+  cipher_list = <%= scope.function_icinga2_config_value([@cipher_list]) %>
+  <%- end -%>
+  <%- if @tls_protocolmin -%>
+  tls_protocolmin = <%= scope.function_icinga2_config_value([@tls_protocolmin]) %>
+  <%- end -%>
 }



More information about the icinga-checkins mailing list