3
0

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

Auto-merge for build 29

See merge request puppet/puppet_cd!25
This commit is contained in:
2025-10-23 19:34:10 +00:00
2 changed files with 13 additions and 7 deletions

View File

@@ -161,7 +161,9 @@
63 63
64 64
65 65
66</pre> 66
67
68</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/r10k/webhook.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/r10k/webhook.pp', line 6</span>
@@ -221,9 +223,11 @@ class puppet_cd::r10k::webhook (
# manage service # manage service
service { &#39;r10k-webhook&#39;: service { &#39;r10k-webhook&#39;:
ensure =&gt; &#39;running&#39;, ensure =&gt; &#39;running&#39;,
enable =&gt; true, hasstatus =&gt; true,
subscribe =&gt; File[$pt_r10k_hook_service_file], hasrestart =&gt; true,
enable =&gt; true,
subscribe =&gt; File[$pt_r10k_hook_service_file],
} }
} }
}</pre> }</pre>

View File

@@ -58,9 +58,11 @@ class puppet_cd::r10k::webhook (
# manage service # manage service
service { 'r10k-webhook': service { 'r10k-webhook':
ensure => 'running', ensure => 'running',
enable => true, hasstatus => true,
subscribe => File[$pt_r10k_hook_service_file], hasrestart => true,
enable => true,
subscribe => File[$pt_r10k_hook_service_file],
} }
} }
} }