Merge branch 'jenkins-build-28' into 'master'

Auto-merge for build 28 See merge request puppet/puppet_cd!24
2025-10-23 19:27:33 +00:00
parent 07799cacf3 12a558bc3a
commit c9b769e826
2 changed files with 4 additions and 4 deletions
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -208,7 +208,7 @@ class puppet_cd::r10k::webhook (
    }

    # create service config
-    file { $pt_r10k_hook_config_file:
+    file { $pt_r10k_hook_service_file:
      owner    =&gt; &#39;root&#39;,
      group    =&gt; &#39;root&#39;,
      mode     =&gt; &#39;0644&#39;,
@@ -223,7 +223,7 @@ class puppet_cd::r10k::webhook (
    service { &#39;r10k-webhook&#39;:
      ensure    =&gt; &#39;running&#39;,
      enable    =&gt; true,
-      subscribe =&gt; File[$pt_r10k_hook_config_file],
+      subscribe =&gt; File[$pt_r10k_hook_service_file],
    }
  }
 }</pre>
--- a/manifests/r10k/webhook.pp
+++ b/manifests/r10k/webhook.pp
@@ -45,7 +45,7 @@ class puppet_cd::r10k::webhook (
    }

    # create service config
-    file { $pt_r10k_hook_config_file:
+    file { $pt_r10k_hook_service_file:
      owner    => 'root',
      group    => 'root',
      mode     => '0644',
@@ -60,7 +60,7 @@ class puppet_cd::r10k::webhook (
    service { 'r10k-webhook':
      ensure    => 'running',
      enable    => true,
-      subscribe => File[$pt_r10k_hook_config_file],
+      subscribe => File[$pt_r10k_hook_service_file],
    }
  }
 }