From 632ba9b0c3c4c4f2358fcf0dc97eaadc473872f3 Mon Sep 17 00:00:00 2001 From: Steffen Zieger Date: Mon, 13 May 2024 16:07:06 +0200 Subject: [PATCH] use sudo::defaults in rhel9 template --- manifests/init.pp | 2 +- templates/sudoers.rhel9.erb | 2 +- types/defaults_operator.pp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 224b72f..ec7dfd3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -148,7 +148,7 @@ Enum['absent','password','nopassword'] $wheel_config = $sudo::params::wheel_config, Optional[Array[String[1]]] $sudoreplay_discard = undef, Hash $configs = {}, - Sudo::Defaults $defaults = $sudo::params::defaults, + Sudo::Defaults $defaults = $sudo::params::defaults, ) inherits sudo::params { case $enable { true: { diff --git a/templates/sudoers.rhel9.erb b/templates/sudoers.rhel9.erb index 5c477e7..266d936 100644 --- a/templates/sudoers.rhel9.erb +++ b/templates/sudoers.rhel9.erb @@ -74,7 +74,6 @@ Defaults match_group_by_gid # Disable this option for new behavior. Defaults always_query_group_plugin -Defaults env_reset Defaults env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE KDEDIR LS_COLORS" Defaults env_keep += "MAIL PS1 PS2 QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE" Defaults env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES" @@ -135,3 +134,4 @@ root ALL=(ALL) ALL <% @extra_include_dirs.each do |include_dir| -%> #includedir <%= include_dir %> <% end if @extra_include_dirs -%> +<%= scope.call_function('sudo::defaults', @defaults) -%> diff --git a/types/defaults_operator.pp b/types/defaults_operator.pp index ffbe598..452efa6 100644 --- a/types/defaults_operator.pp +++ b/types/defaults_operator.pp @@ -1 +1,2 @@ +# @summary custom datatype that validates sudo defaults operators type Sudo::Defaults_operator = Enum['=','+=','-=','!']