3
0

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

Auto-merge for build 63

See merge request puppet/puppet_cd!59
This commit is contained in:
2025-10-26 14:33:07 +00:00
2 changed files with 10 additions and 7 deletions

View File

@@ -146,7 +146,8 @@
48 48
49 49
50 50
51</pre> 51
52</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -168,6 +169,7 @@ class puppet_cd::firewall::iptables (
if $pt_use_r10k_webhook == true { if $pt_use_r10k_webhook == true {
firewall { &quot;3${pt_r10k_webhook_port} open port ${pt_r10k_webhook_port}&quot;: firewall { &quot;3${pt_r10k_webhook_port} open port ${pt_r10k_webhook_port}&quot;:
proto =&gt; &#39;tcp&#39;, proto =&gt; &#39;tcp&#39;,
source =&gt; &#39;10.0.1.0/24&#39;,
dport =&gt; $pt_r10k_webhook_port, dport =&gt; $pt_r10k_webhook_port,
jump =&gt; &#39;accept&#39;, jump =&gt; &#39;accept&#39;,
} }

View File

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