confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Projects Wiki Activity

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

Browse Source 
Auto-merge for build 77

See merge request puppet/puppet_cd!73
This commit is contained in:
Jenkins
2025-10-27 18:14:57 +00:00
parent 58c65001e5 5bb4e215a8
commit b495b4970d
2 changed files with 1 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html
View File

@@ -124,30 +124,7 @@
26 26
27 27
28 28
29 29</pre>
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
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>
@@ -175,29 +152,6 @@ class puppet_cd::firewall::iptables (
} }
} }
} }
if $fqdn == $pt_db_fqdn {
if $pt_use_ssl_only != true {
firewall { &quot;3${pt_no_ssl_port} open port ${pt_no_ssl_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; $pt_no_ssl_port,
jump =&gt; &#39;accept&#39;,
}
firewall { &quot;3${pt_ssl_port} open port ${pt_ssl_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; $pt_ssl_port,
jump =&gt; &#39;accept&#39;,
}
}
if $pt_use_ssl_only == true {
firewall { &quot;3${pt_ssl_port} open port ${pt_ssl_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; $pt_ssl_port,
jump =&gt; &#39;accept&#39;,
}
}
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

23
manifests/firewall/iptables.pp
View File

@@ -26,27 +26,4 @@ class puppet_cd::firewall::iptables (
} }
} }
} }
if $fqdn == $pt_db_fqdn {
if $pt_use_ssl_only != true {
firewall { "3${pt_no_ssl_port} open port ${pt_no_ssl_port}":
proto => 'tcp',
dport => $pt_no_ssl_port,
jump => 'accept',
}
firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
proto => 'tcp',
dport => $pt_ssl_port,
jump => 'accept',
}
}
if $pt_use_ssl_only == true {
firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
proto => 'tcp',
dport => $pt_ssl_port,
jump => 'accept',
}
}
}
} }