Recommit for updates in build 34
This commit is contained in:
@@ -1502,6 +1502,24 @@
|
||||
—
|
||||
<div class='inline'>
|
||||
<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>''</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the secret for the webhook</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -1517,7 +1535,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
@@ -1678,10 +1695,12 @@
|
||||
246
|
||||
247
|
||||
248
|
||||
249</pre>
|
||||
249
|
||||
250
|
||||
251</pre>
|
||||
</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 (
|
||||
|
||||
@@ -1773,6 +1792,7 @@ class puppet_cd::params (
|
||||
String $pt_r10k_remote = 'git@gitlab.example.net/repo.git',
|
||||
Boolean $pt_r10k_prefix = false,
|
||||
String $pt_r10k_basedir = '/etc/puppetlabs/code/environments',
|
||||
String $pt_webhook_secret = '',
|
||||
|
||||
) {
|
||||
# facts
|
||||
|
||||
@@ -163,7 +163,8 @@
|
||||
65
|
||||
66
|
||||
67
|
||||
68</pre>
|
||||
68
|
||||
69</pre>
|
||||
</td>
|
||||
<td>
|
||||
<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 => etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_r10k_hook_config_erb),
|
||||
notify => Service['webhook'],
|
||||
}
|
||||
|
||||
# create service config
|
||||
@@ -219,15 +221,15 @@ class puppet_cd::r10k::webhook (
|
||||
seltype => systemd_unit_file_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_r10k_hook_service_erb),
|
||||
notify => Service['webhook'],
|
||||
}
|
||||
|
||||
# manage service
|
||||
service { 'r10k-webhook':
|
||||
service { 'webhook':
|
||||
ensure => 'running',
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
enable => true,
|
||||
subscribe => File[$pt_r10k_hook_service_file],
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
|
||||
Reference in New Issue
Block a user