3
0

Recommit for updates in build 58

This commit is contained in:
2025-10-26 14:28:12 +01:00
parent 937f3bae5b
commit 5143fe80dc
13 changed files with 62 additions and 26 deletions

View File

@@ -87,8 +87,6 @@
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Aservice.html" title="puppet_classes::puppet_cd::puppetdb::service (puppet_class)">puppet_cd::puppetdb::service</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span><br/>
</dd>
</dl>
@@ -252,7 +250,7 @@
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#39;]</tt>)</em>
<em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;rubygems&#39;,&#39;gcc&#39;,&#39;make&#39;]</tt>)</em>
&mdash;
@@ -1473,10 +1471,10 @@
<span class='name'>pt_r10k_webhook_pkg</span>
<span class='type'>(<tt>String</tt>)</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/tmp/webhook-go.rpm&#39;</tt>)</em>
<em class="default">(defaults to: <tt>[&#39;webrick&#39;, &#39;r10k_gitlab_webhook&#39;]</tt>)</em>
&mdash;
@@ -1500,6 +1498,24 @@
&mdash;
<div class='inline'>
<p>whether to manage the puppet user</p>
</div>
</li>
<li>
<span class='name'>pt_r10k_webhook_port</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;8080&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the port for the webhook listener</p>
</div>
</li>
@@ -1515,7 +1531,6 @@
<pre class="lines">
88
89
90
91
@@ -1672,10 +1687,15 @@
242
243
244
245</pre>
245
246
247
248
249
250</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 (
@@ -1688,8 +1708,8 @@ class puppet_cd::params (
String $pt_agent_pkg = &#39;puppet-agent&#39;,
String $pt_server_pkg = &#39;puppetserver&#39;,
Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;],
Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#39;],
String $pt_r10k_webhook_pkg = &#39;/tmp/webhook-go.rpm&#39;,
Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;rubygems&#39;,&#39;gcc&#39;,&#39;make&#39;],
Array $pt_r10k_webhook_pkg = [&#39;webrick&#39;, &#39;r10k_gitlab_webhook&#39;],
# user settings
## puppet user
@@ -1767,6 +1787,7 @@ class puppet_cd::params (
String $pt_r10k_remote = &#39;git@gitlab.example.net/repo.git&#39;,
Boolean $pt_r10k_prefix = false,
String $pt_r10k_basedir = &#39;/etc/puppetlabs/code/environments&#39;,
String $pt_r10k_webhook_port = &#39;8080&#39;,
) {
# facts
@@ -1824,12 +1845,15 @@ class puppet_cd::params (
## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;
$pt_r10k_erb = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
$pt_webhook_link = &#39;ln -sf /usr/local/share/gems/gems/r10k_gitlab_webhook-0.1.3/bin/r10k_gitlab_webhook /usr/bin/&#39;
$pt_webhook_service_file = &#39;/etc/systemd/system/r10k_gitlab_webhook.service&#39;
$pt_webhook_service_erb = &#39;puppet_cd/r10k/r10k_webhook_service.erb&#39;
# service
$pt_server_service = &#39;puppetserver&#39;
$pt_agent_service = &#39;puppet&#39;
$pt_db_service = &#39;puppetdb&#39;
$pt_webhook_service = &#39;webhook-go.service&#39;
$pt_r10k_webhook_service = &#39;r10k_gitlab_webhook&#39;
#
# includes must be last