Merge branch 'jenkins-build-63' into 'master'
Auto-merge for build 63 See merge request puppet/puppet_cd!59
This commit is contained in:
@@ -146,7 +146,8 @@
|
||||
48
|
||||
49
|
||||
50
|
||||
51</pre>
|
||||
51
|
||||
52</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
|
||||
@@ -167,9 +168,10 @@ 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,
|
||||
jump => 'accept',
|
||||
proto => 'tcp',
|
||||
source => '10.0.1.0/24',
|
||||
dport => $pt_r10k_webhook_port,
|
||||
jump => 'accept',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,9 +19,10 @@ 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,
|
||||
jump => 'accept',
|
||||
proto => 'tcp',
|
||||
source => '10.0.1.0/24',
|
||||
dport => $pt_r10k_webhook_port,
|
||||
jump => 'accept',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user