From 7cd8d5d35b4faac8e3c7a27f834e0a99cc8c57bc Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 23 Oct 2025 18:01:25 +0200 Subject: [PATCH 1/2] finish add proper deps - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/r10k/webhook.pp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/r10k/webhook.pp b/manifests/r10k/webhook.pp index 26d5a41..be78c05 100644 --- a/manifests/r10k/webhook.pp +++ b/manifests/r10k/webhook.pp @@ -25,6 +25,15 @@ class puppet_cd::r10k::webhook ( seluser => system_u, } + # create the log file + file { '/var/log/r10k-webhook.log': + ensure => file, + owner => 'puppet', + group => 'puppet', + mode => '0644', + require => File['/opt/r10k-webhook'], + } + # create the requirements file file { $pt_r10k_req_file: ensure => file, @@ -36,7 +45,7 @@ class puppet_cd::r10k::webhook ( seltype => puppet_etc_t, seluser => system_u, content => template($pt_r10k_req_erb), - require => File['/opt/r10k-webhook'], + require => File['/var/log/r10k-webhook.log'], } # create the binary file From dc7588279a8481e1ee556b5a9027ea94ffae8192 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 18:03:13 +0200 Subject: [PATCH 2/2] Recommit for updates in build 15 --- .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html index 5b1d483..ac3c328 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html @@ -189,7 +189,16 @@ 91 92 93 -94 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103
# File 'manifests/r10k/webhook.pp', line 6
@@ -216,6 +225,15 @@ class puppet_cd::r10k::webhook (
       seluser  => system_u,
     }
 
+    # create the log file
+    file { '/var/log/r10k-webhook.log':
+      ensure  => file,
+      owner   => 'puppet',
+      group   => 'puppet',
+      mode    => '0644',
+      require => File['/opt/r10k-webhook'],
+    }
+
     # create the requirements file
     file { $pt_r10k_req_file:
       ensure   => file,
@@ -227,7 +245,7 @@ class puppet_cd::r10k::webhook (
       seltype  => puppet_etc_t,
       seluser  => system_u,
       content  => template($pt_r10k_req_erb),
-      require  => File['/opt/r10k-webhook'],
+      require  => File['/var/log/r10k-webhook.log'],
     }
 
     # create the binary file