From 2866437006b4ac59ed46e5bafbe2c48d885d4d61 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 28 Jul 2023 21:37:15 +0200
Subject: [PATCH 1/2] r10k_yaml_template: move default to params.pp

---
 REFERENCE.md        | 2 +-
 manifests/config.pp | 2 +-
 manifests/params.pp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index ac9556ce..d7fa4e4c 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -527,7 +527,7 @@ Data type: `String`
 
 
 
-Default value: `'r10k/r10k.yaml.erb'`
+Default value: `$r10k::params::r10k_yaml_template`
 
 ### <a name="r10k--install"></a>`r10k::install`
 
diff --git a/manifests/config.pp b/manifests/config.pp
index 881a1f32..0d73428a 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -70,7 +70,7 @@
   Stdlib::Absolutepath $puppetconf_path     = $r10k::params::puppetconf_path,
   Optional[String[1]] $proxy                = $r10k::params::proxy,
   Optional[Integer[1]] $pool_size           = $r10k::params::pool_size,
-  String $r10k_yaml_template                = 'r10k/r10k.yaml.erb',
+  String $r10k_yaml_template                = $r10k::params::r10k_yaml_template,
 ) inherits r10k::params {
   if $sources == undef {
     $r10k_sources  = {
diff --git a/manifests/params.pp b/manifests/params.pp
index 20e06738..15ea68c7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,5 +1,6 @@
 # Reasonable defaults for all classes
 class r10k::params {
+  $r10k_yaml_template     = 'r10k/r10k.yaml.erb'
   $package_name           = ''
   $version                = 'installed'
   $manage_modulepath      = false

From 403eea2b949b4eb70bb81d1999019c90587e6b9e Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 28 Jul 2023 21:43:35 +0200
Subject: [PATCH 2/2] config: move postrun default to params.pp

---
 REFERENCE.md        | 4 ++--
 manifests/config.pp | 2 +-
 manifests/params.pp | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index d7fa4e4c..62582a2a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -475,11 +475,11 @@ Default value: `$r10k::params::deploy_settings`
 
 ##### <a name="-r10k--config--postrun"></a>`postrun`
 
-Data type: `Optional[Array]`
+Data type: `Array[String[1]]`
 
 
 
-Default value: `undef`
+Default value: `$r10k::params::postrun`
 
 ##### <a name="-r10k--config--root_user"></a>`root_user`
 
diff --git a/manifests/config.pp b/manifests/config.pp
index 0d73428a..23e630b6 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -64,7 +64,7 @@
   Hash $git_settings                        = $r10k::params::git_settings,
   Hash $forge_settings                      = $r10k::params::forge_settings,
   Hash $deploy_settings                     = $r10k::params::deploy_settings,
-  Optional[Array] $postrun                  = undef,
+  Array[String[1]] $postrun                 = $r10k::params::postrun,
   $root_user                                = $r10k::params::root_user,
   $root_group                               = $r10k::params::root_group,
   Stdlib::Absolutepath $puppetconf_path     = $r10k::params::puppetconf_path,
diff --git a/manifests/params.pp b/manifests/params.pp
index 15ea68c7..d9acbe6d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,5 +1,6 @@
 # Reasonable defaults for all classes
 class r10k::params {
+  $postrun                = []
   $r10k_yaml_template     = 'r10k/r10k.yaml.erb'
   $package_name           = ''
   $version                = 'installed'