Recommit for updates in build 19
This commit is contained in:
@@ -742,7 +742,8 @@
|
|||||||
104
|
104
|
||||||
105
|
105
|
||||||
106
|
106
|
||||||
107</pre>
|
107
|
||||||
|
108</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 38</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 38</span>
|
||||||
@@ -805,9 +806,10 @@ class confdroid_postgresql::params (
|
|||||||
$pl_pg_hba_rule_conf = 'confdroid_postgresql/server/pghba/pg_hba_rule.conf.erb'
|
$pl_pg_hba_rule_conf = 'confdroid_postgresql/server/pghba/pg_hba_rule.conf.erb'
|
||||||
$pl_pg_hba_conf_erb = 'confdroid_postgresql/server/pghba/pg_hba.conf.erb'
|
$pl_pg_hba_conf_erb = 'confdroid_postgresql/server/pghba/pg_hba.conf.erb'
|
||||||
$pl_bouncer_ini_file = "${pl_bouncer_dir}/pgbouncer.ini"
|
$pl_bouncer_ini_file = "${pl_bouncer_dir}/pgbouncer.ini"
|
||||||
$pl_bouncer_ini_erb = 'confdroid_postgresql/server/bouncer/pgbouncer_rule.erb'
|
$pl_bouncer_ini_erb = 'confdroid_postgresql/server/bouncer/pgbouncer.ini.erb'
|
||||||
$pl_bouncer_auth_file = "${pl_bouncer_dir}/userlist.txt"
|
$pl_bouncer_auth_file = "${pl_bouncer_dir}/userlist.txt"
|
||||||
$pl_bouncer_auth_erb = 'confdroid_postgresql/server/bouncer/bouncer_users.erb'
|
$pl_bouncer_auth_erb = 'confdroid_postgresql/server/bouncer/bouncer_users.erb'
|
||||||
|
$pl_bouncer_rule_erb = 'confdroid_postgresql/server/bouncer/bouncer_rule.erb'
|
||||||
|
|
||||||
# Service
|
# Service
|
||||||
$pl_service = 'postgresql'
|
$pl_service = 'postgresql'
|
||||||
|
|||||||
@@ -231,7 +231,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_rule_erb),
|
||||||
order => $pl_bouncer_order,
|
order => $pl_bouncer_order,
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
|
|||||||
Reference in New Issue
Block a user