3
0

Recommit for updates in build 34

This commit is contained in:
2025-10-23 22:16:37 +02:00
parent 7debbd990c
commit 5ae6cd2408
2 changed files with 28 additions and 6 deletions

View File

@@ -1502,6 +1502,24 @@
— —
<div class='inline'> <div class='inline'>
<p>whether to manage the puppet user</p> <p>whether to manage the puppet user</p>
</div>
</li>
<li>
<span class='name'>pt_webhook_secret</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the secret for the webhook</p>
</div> </div>
</li> </li>
@@ -1517,7 +1535,6 @@
<pre class="lines"> <pre class="lines">
88
89 89
90 90
91 91
@@ -1678,10 +1695,12 @@
246 246
247 247
248 248
249</pre> 249
250
251</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
class puppet_cd::params ( class puppet_cd::params (
@@ -1773,6 +1792,7 @@ class puppet_cd::params (
String $pt_r10k_remote = &#39;git@gitlab.example.net/repo.git&#39;, String $pt_r10k_remote = &#39;git@gitlab.example.net/repo.git&#39;,
Boolean $pt_r10k_prefix = false, Boolean $pt_r10k_prefix = false,
String $pt_r10k_basedir = &#39;/etc/puppetlabs/code/environments&#39;, String $pt_r10k_basedir = &#39;/etc/puppetlabs/code/environments&#39;,
String $pt_webhook_secret = &#39;&#39;,
) { ) {
# facts # facts

View File

@@ -163,7 +163,8 @@
65 65
66 66
67 67
68</pre> 68
69</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>
@@ -207,6 +208,7 @@ class puppet_cd::r10k::webhook (
seltype =&gt; etc_t, seltype =&gt; etc_t,
seluser =&gt; system_u, seluser =&gt; system_u,
content =&gt; template($pt_r10k_hook_config_erb), content =&gt; template($pt_r10k_hook_config_erb),
notify =&gt; Service[&#39;webhook&#39;],
} }
# create service config # create service config
@@ -219,15 +221,15 @@ class puppet_cd::r10k::webhook (
seltype =&gt; systemd_unit_file_t, seltype =&gt; systemd_unit_file_t,
seluser =&gt; system_u, seluser =&gt; system_u,
content =&gt; template($pt_r10k_hook_service_erb), content =&gt; template($pt_r10k_hook_service_erb),
notify =&gt; Service[&#39;webhook&#39;],
} }
# manage service # manage service
service { &#39;r10k-webhook&#39;: service { &#39;webhook&#39;:
ensure =&gt; &#39;running&#39;, ensure =&gt; &#39;running&#39;,
hasstatus =&gt; true, hasstatus =&gt; true,
hasrestart =&gt; true, hasrestart =&gt; true,
enable =&gt; true, enable =&gt; true,
subscribe =&gt; File[$pt_r10k_hook_service_file],
} }
} }
}</pre> }</pre>