3
0

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

Auto-merge for build 59

See merge request puppet/puppet_cd!55
This commit is contained in:
2025-10-26 13:39:28 +00:00
5 changed files with 28 additions and 14 deletions

View File

@@ -73,6 +73,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span>

View File

@@ -43,77 +43,84 @@
</li>
<li id="object_puppet_classes::puppet_cd::main::config" class="even">
<li id="object_puppet_classes::puppet_cd::firewall::iptables" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::config" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::dirs" class="odd">
<li id="object_puppet_classes::puppet_cd::main::dirs" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::puppet_cd::main::dirs (puppet_class)">puppet_cd::main::dirs</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::files" class="even">
<li id="object_puppet_classes::puppet_cd::main::files" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::puppet_cd::main::files (puppet_class)">puppet_cd::main::files</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::install" class="odd">
<li id="object_puppet_classes::puppet_cd::main::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::user" class="even">
<li id="object_puppet_classes::puppet_cd::main::user" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::params" class="odd">
<li id="object_puppet_classes::puppet_cd::params" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::puppetdb::dirs" class="even">
<li id="object_puppet_classes::puppet_cd::puppetdb::dirs" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::puppetdb::files" class="odd">
<li id="object_puppet_classes::puppet_cd::puppetdb::files" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::puppetdb::service" class="even">
<li id="object_puppet_classes::puppet_cd::puppetdb::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html" title="puppet_classes::puppet_cd::puppetdb::service (puppet_class)">puppet_cd::puppetdb::service</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::r10k::install" class="odd">
<li id="object_puppet_classes::puppet_cd::r10k::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::server::service" class="even">
<li id="object_puppet_classes::puppet_cd::server::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span>
</div>

View File

@@ -166,9 +166,9 @@ class puppet_cd::firewall::iptables (
jump =&gt; &#39;accept&#39;,
}
if $pt_use_r10k_webhook == true {
firewall { &#39;34000 open port 4000&#39;:
firewall { &quot;3${pt_r10k_webhook_port} open port ${pt_r10k_webhook_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; &#39;4000&#39;,
dport =&gt; $pt_r10k_webhook_port,
jump =&gt; &#39;accept&#39;,
}
}

View File

@@ -87,6 +87,8 @@
<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>

View File

@@ -20,7 +20,7 @@ class puppet_cd::firewall::iptables (
if $pt_use_r10k_webhook == true {
firewall { "3${pt_r10k_webhook_port} open port ${pt_r10k_webhook_port}":
proto => 'tcp',
dport => $pt_r10k_webhook_port
dport => $pt_r10k_webhook_port,
jump => 'accept',
}
}