From 5a21de182d02b4bb679319b4c50fe7de1e6840ac Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 23 Oct 2025 20:29:28 +0200 Subject: [PATCH 1/2] starting over with hook - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/params.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/params.pp b/manifests/params.pp index eca724d..6bd67fd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -201,6 +201,8 @@ class puppet_cd::params ( $pt_puppetdb_ssl = "${pt_puppetdb_main}/ssl" $pt_puppetdb_log = '/var/log/puppetlabs/puppetdb' $pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb' +## r10k + $pt_r10k_dir = "${pt_main_dir}/r10k" # files ## puppet @@ -228,6 +230,7 @@ class puppet_cd::params ( $pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb' ## r10k $pt_r10k_hook_file = '/usr/local/bin/webhook' + $pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb' # service $pt_server_service = 'puppetserver' From b849ac0994a80071316ea346b43dafb12e479ea7 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 20:31:21 +0200 Subject: [PATCH 2/2] Recommit for updates in build 22 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 0df5e7c..2eb2bb9 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1670,7 +1670,10 @@ 238 239 240 -241 +241 +242 +243 +244
# File 'manifests/params.pp', line 88
@@ -1791,6 +1794,8 @@ class puppet_cd::params (
   $pt_puppetdb_ssl                  = "${pt_puppetdb_main}/ssl"
   $pt_puppetdb_log                  = '/var/log/puppetlabs/puppetdb'
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
+## r10k
+  $pt_r10k_dir                      = "${pt_main_dir}/r10k"
 
 # files
 ## puppet
@@ -1818,6 +1823,7 @@ class puppet_cd::params (
   $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
 ## r10k
   $pt_r10k_hook_file                = '/usr/local/bin/webhook'
+  $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
 
 # service
   $pt_server_service                = 'puppetserver'