3
0

Recommit for updates in build 23

This commit is contained in:
2025-12-05 16:23:04 +01:00
parent 574c5ddeff
commit 491b2ef86c
3 changed files with 28 additions and 12 deletions

View File

@@ -100,11 +100,11 @@
<p>confdroid_postgresql::bouncer::bouncer_rule { test connection:</p> <p>confdroid_postgresql::bouncer::bouncer_rule { test connection:</p>
</div></p> </div></p>
<pre class="example code"><code>pl_bouncer_db_name =&gt; &#39;test&#39;, <pre class="example code"><code>pl_bouncer_db_name =&gt; &#39;test&#39;,
pl_bouncer_host =&gt; &#39;127.0.0.7&#39;, pl_bouncer_host =&gt; &#39;127.0.0.7&#39;,
pl_bouncer_port =&gt; &#39;5432&#39;, pl_bouncer_host_port =&gt; &#39;5432&#39;,
pl_bouncer_user =&gt; &#39;test_user&#39;, pl_bouncer_user =&gt; &#39;test_user&#39;,
pl_bouncer_order =&gt; &#39;001&#39;,</code></pre> pl_bouncer_order =&gt; &#39;001&#39;,</code></pre>
</div> </div>

View File

@@ -112,7 +112,15 @@
14 14
15 15
16 16
17</pre> 17
18
19
20
21
22
23
24
25</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>
@@ -127,6 +135,14 @@ class confdroid_postgresql::firewall::iptables (
dport =&gt; $pl_fw_port, dport =&gt; $pl_fw_port,
jump =&gt; &#39;accept&#39;, jump =&gt; &#39;accept&#39;,
} }
if $pl_use_pg_bouncer == true {
firewall { &quot;${pl_fw_rule_order}${pl_bouncer_port} tcp port ${pl_bouncer_port}&quot;:
source =&gt; $pl_source_range,
proto =&gt; &#39;tcp&#39;,
dport =&gt; $pl_bouncer_port,
jump =&gt; &#39;accept&#39;,
}
}
} }
}</pre> }</pre>
</td> </td>

View File

@@ -125,7 +125,7 @@
<li> <li>
<span class='name'>pl_bouncer_port</span> <span class='name'>pl_bouncer_host_port</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
@@ -220,11 +220,11 @@
define confdroid_postgresql::bouncer::bouncer_rule ( define confdroid_postgresql::bouncer::bouncer_rule (
String $pl_bouncer_db_name = undef, String $pl_bouncer_db_name = undef,
String $pl_bouncer_host = &#39;127.0.0.1&#39;, String $pl_bouncer_host = &#39;127.0.0.1&#39;,
String $pl_bouncer_port = &#39;5432&#39;, String $pl_bouncer_host_port = &#39;5432&#39;,
String $pl_bouncer_user = undef, String $pl_bouncer_user = undef,
String $pl_bouncer_order = undef, String $pl_bouncer_order = undef,
) { ) {
$pl_bouncer_ini_file = $confdroid_postgresql::params::pl_bouncer_ini_file $pl_bouncer_ini_file = $confdroid_postgresql::params::pl_bouncer_ini_file