From bf161a9778aec417335261e3a14dbf6c2e451417 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 28 Jul 2023 19:57:04 +0200
Subject: [PATCH] deploy settings: generate types by default and dont deploy
 spec dir

for a long time r10k supports generating types. It's not required to do
this in a custom posthook. Also r10k has an option to ignore the spec
dir from modules. To provide a good user experience we should enable it.

This was introduced in r10k 3.11: https://github.com/puppetlabs/r10k/blob/main/CHANGELOG.mkd#3110
---
 REFERENCE.md        | 2 +-
 manifests/init.pp   | 2 +-
 manifests/params.pp | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index ac9556ce..f3c12d40 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -231,7 +231,7 @@ Data type: `Hash`
 
 
 
-Default value: `$r10k::params::deploy_settings`
+Default value: `{ 'generate_types' => true, 'exclude_spec' => true, }`
 
 ##### <a name="-r10k--root_user"></a>`root_user`
 
diff --git a/manifests/init.pp b/manifests/init.pp
index ad0ed1ea..0e5a2fad 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,7 +19,7 @@
   $configfile_symlink                                         = $r10k::params::configfile_symlink,
   Hash $git_settings                                          = $r10k::params::git_settings,
   Hash $forge_settings                                        = $r10k::params::forge_settings,
-  Hash $deploy_settings                                       = $r10k::params::deploy_settings,
+  Hash $deploy_settings                                       = { 'generate_types' => true, 'exclude_spec' => true, },
   $root_user                                                  = $r10k::params::root_user,
   Optional[String[1]] $proxy                                  = $r10k::params::proxy,
   Optional[Integer[1]] $pool_size                             = $r10k::params::pool_size,
diff --git a/manifests/params.pp b/manifests/params.pp
index 20e06738..727f2f27 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -34,7 +34,6 @@
   $configfile_symlink        = '/etc/r10k.yaml'
   $git_settings              = {}
   $forge_settings            = {}
-  $deploy_settings           = {}
   # Git configuration
   $git_server = $settings::ca_server #lint:ignore:top_scope_facts
   $repo_path  = '/var/repos'