Recommit for updates in build 15
This commit is contained in:
@@ -143,7 +143,7 @@
|
|||||||
|
|
||||||
<li>
|
<li>
|
||||||
|
|
||||||
<span class='name'>pl_bounce_order</span>
|
<span class='name'>pl_bouncer_user</span>
|
||||||
|
|
||||||
|
|
||||||
<span class='type'>(<tt>String</tt>)</span>
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
@@ -152,6 +152,29 @@
|
|||||||
<em class="default">(defaults to: <tt>undef</tt>)</em>
|
<em class="default">(defaults to: <tt>undef</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>user for the connection. Must be defined in userlist.txt</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<span class='name'>pl_bouncer_order</span>
|
||||||
|
|
||||||
|
|
||||||
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
|
<em class="default">(defaults to: <tt>undef</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
|
—
|
||||||
|
<div class='inline'>
|
||||||
|
<p>the order in which the rule should appear</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
@@ -172,9 +195,6 @@
|
|||||||
<pre class="lines">
|
<pre class="lines">
|
||||||
|
|
||||||
|
|
||||||
10
|
|
||||||
11
|
|
||||||
12
|
|
||||||
13
|
13
|
||||||
14
|
14
|
||||||
15
|
15
|
||||||
@@ -188,17 +208,22 @@
|
|||||||
23
|
23
|
||||||
24
|
24
|
||||||
25
|
25
|
||||||
26</pre>
|
26
|
||||||
|
27
|
||||||
|
28
|
||||||
|
29
|
||||||
|
30</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/bouncer/bouncer_rule.pp', line 10</span>
|
<pre class="code"><span class="info file"># File 'manifests/bouncer/bouncer_rule.pp', line 13</span>
|
||||||
|
|
||||||
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_port = '5432',
|
||||||
String $pl_bounce_order = undef,
|
String $pl_bouncer_user = 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
|
||||||
@@ -207,7 +232,7 @@ define confdroid_postgresql::bouncer::bouncer_rule (
|
|||||||
concat::fragment { "pl_bouncer_rule_${name}":
|
concat::fragment { "pl_bouncer_rule_${name}":
|
||||||
target => $pl_bouncer_ini_file,
|
target => $pl_bouncer_ini_file,
|
||||||
content => template($pl_bouncer_ini_erb),
|
content => template($pl_bouncer_ini_erb),
|
||||||
order => $pl_bounce_order,
|
order => $pl_bouncer_order,
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
Reference in New Issue
Block a user