Recommit for updates in build 23
This commit is contained in:
@@ -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 => 'test',
|
<pre class="example code"><code>pl_bouncer_db_name => 'test',
|
||||||
pl_bouncer_host => '127.0.0.7',
|
pl_bouncer_host => '127.0.0.7',
|
||||||
pl_bouncer_port => '5432',
|
pl_bouncer_host_port => '5432',
|
||||||
pl_bouncer_user => 'test_user',
|
pl_bouncer_user => 'test_user',
|
||||||
pl_bouncer_order => '001',</code></pre>
|
pl_bouncer_order => '001',</code></pre>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -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 => $pl_fw_port,
|
dport => $pl_fw_port,
|
||||||
jump => 'accept',
|
jump => 'accept',
|
||||||
}
|
}
|
||||||
|
if $pl_use_pg_bouncer == true {
|
||||||
|
firewall { "${pl_fw_rule_order}${pl_bouncer_port} tcp port ${pl_bouncer_port}":
|
||||||
|
source => $pl_source_range,
|
||||||
|
proto => 'tcp',
|
||||||
|
dport => $pl_bouncer_port,
|
||||||
|
jump => 'accept',
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -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 = '127.0.0.1',
|
String $pl_bouncer_host = '127.0.0.1',
|
||||||
String $pl_bouncer_port = '5432',
|
String $pl_bouncer_host_port = '5432',
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user