From 628b6a1b39add592cb126f5fb59ff9b4fc5b74b0 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Fri, 24 Jun 2022 21:28:31 -0400 Subject: [PATCH] Match template to manifest (#123) Fixes #122 --- CHANGELOG | 3 +++ metadata.json | 2 +- templates/provider/krb5.epp | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e75e17c..64ac68d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Wed Jun 22 2022 Yehuda Katz - 7.4.1 +- Allow `krb5_server` to be optional as implemented in the template + * Fri Jun 03 2022 Chris Tessmer - 7.4.0 - Update from camptocamp/systemd to puppet/systemd diff --git a/metadata.json b/metadata.json index 254a461..b61abc1 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-sssd", - "version": "7.4.0", + "version": "7.4.1", "author": "SIMP Team", "summary": "Manages SSSD", "license": "Apache-2.0", diff --git a/templates/provider/krb5.epp b/templates/provider/krb5.epp index 8bd811b..141422e 100644 --- a/templates/provider/krb5.epp +++ b/templates/provider/krb5.epp @@ -1,6 +1,6 @@ <%- | String $domain, - Simplib::Host $krb5_server, + Optional[Simplib::Host] $krb5_server = undef, String $krb5_realm, Optional[Sssd::DebugLevel] $debug_level = undef, Boolean $debug_timestamps = true, @@ -24,7 +24,9 @@ debug_level = <%= $debug_level %> <% } -%> debug_timestamps = <%= $debug_timestamps %> debug_microseconds = <%= $debug_microseconds %> +<% if $krb5_server { -%> krb5_server = <%= $krb5_server %> +<% } -%> krb5_realm = <%= $krb5_realm %> <% if $krb5_kpasswd { -%> krb5_kpasswd = <%= $krb5_kpasswd %>