From 1671706f99af056193ea1570209410ba015344f7 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 23 Oct 2025 21:19:16 +0200 Subject: [PATCH] fix syntax - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/params.pp | 5 ++--- manifests/r10k/webhook.pp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 8651e03..cbca9e0 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -203,7 +203,7 @@ class puppet_cd::params ( $pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb' ## r10k $pt_r10k_dir = "${pt_main_dir}/r10k" - $pt_r10k_webhook_dir = */etc/r10k-webhook' + $pt_r10k_webhook_dir = '/etc/r10k-webhook' # files ## puppet @@ -236,13 +236,12 @@ class puppet_cd::params ( $pt_r10k_hook_config_file = "${pt_r10k_webhook_dir}/hooks.json" $pt_r10k_hook_config_erb = 'puppet_cd/r10k/hook_config.erb' $pt_r10k_hook_service_file = '/etc/systemd/system/webhook.service' - $pt_r10k_hook_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb' + $pt_r10k_hook_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb' # service $pt_server_service = 'puppetserver' $pt_agent_service = 'puppet' $pt_db_service = 'puppetdb' - $pt_r10k_wb_service = 'r10k-webhook' # # includes must be last diff --git a/manifests/r10k/webhook.pp b/manifests/r10k/webhook.pp index ed69d98..3c9c411 100644 --- a/manifests/r10k/webhook.pp +++ b/manifests/r10k/webhook.pp @@ -60,7 +60,7 @@ class puppet_cd::r10k::webhook ( service { 'r10k-webhook': ensure => 'running', enable => true, - subscribe => File[$pt_r10k_hook_service_erb], + subscribe => File[$pt_r10k_hook_config_file], } } }