Recommit for updates in build 11
This commit is contained in:
@@ -83,6 +83,10 @@
|
||||
|
||||
<span class='object_link'><a href="confdroid_postgresql_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_postgresql::server::service (puppet_class)">confdroid_postgresql::server::service</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="confdroid_postgresql_3A_3Abouncer_3A_3Abouncer.html" title="puppet_classes::confdroid_postgresql::bouncer::bouncer (puppet_class)">confdroid_postgresql::bouncer::bouncer</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="confdroid_postgresql_3A_3Abouncer_3A_3Aservice.html" title="puppet_classes::confdroid_postgresql::bouncer::service (puppet_class)">confdroid_postgresql::bouncer::service</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="confdroid_postgresql_3A_3Aexporter_3A_3Aservice.html" title="puppet_classes::confdroid_postgresql::exporter::service (puppet_class)">confdroid_postgresql::exporter::service</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="confdroid_postgresql_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_postgresql::firewall::iptables (puppet_class)">confdroid_postgresql::firewall::iptables</a></span><br/>
|
||||
@@ -107,7 +111,7 @@
|
||||
<div class="docstring">
|
||||
<div class="discussion">
|
||||
|
||||
<p>confdroid_postgresql::params.pp Module name: confdroid_postgresql Author: Arne Teuke (arne_teuke@confdroid.com)</p>
|
||||
<p>confdroid_postgresql::params.pp Module name: confdroid_postgresql Author: 12ww1160 (12ww1160@confdroid.com)</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -190,6 +194,24 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>reqpackages_bouncer</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'pgbouncer'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the packages for the bouncer</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pkg_ensure</span>
|
||||
@@ -516,15 +538,128 @@
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>reqpackages_bouncer</span>
|
||||
<span class='name'>pl_bouncer_listen_addr</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'pgbouncer'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'0.0.0.0'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>bouncer listen address</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pl_bouncer_port</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'6432'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>bouncer listen port</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pl_bouncer_auth_mode</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'md5'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>bouncer auth mode</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pl_bouncer_auth_users</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'placeholder'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>placeholder for users</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pl_bouncer_pool_mode</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'transaction'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>bouncer pool mode</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pl_bouncer_mx_cl_conn</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'100'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>bouncer max client connections</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pl_bouncer_pool_size</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'20'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>bouncer default pool size</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@@ -538,14 +673,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
30
|
||||
31
|
||||
32
|
||||
33
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
@@ -594,10 +721,31 @@
|
||||
83
|
||||
84
|
||||
85
|
||||
86</pre>
|
||||
86
|
||||
87
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
92
|
||||
93
|
||||
94
|
||||
95
|
||||
96
|
||||
97
|
||||
98
|
||||
99
|
||||
100
|
||||
101
|
||||
102
|
||||
103
|
||||
104
|
||||
105
|
||||
106
|
||||
107</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 30</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 38</span>
|
||||
|
||||
class confdroid_postgresql::params (
|
||||
|
||||
@@ -634,6 +782,13 @@ class confdroid_postgresql::params (
|
||||
|
||||
# pg bouncer
|
||||
Boolean $pl_use_pg_bouncer = false,
|
||||
String $pl_bouncer_listen_addr = '0.0.0.0',
|
||||
String $pl_bouncer_port = '6432',
|
||||
String $pl_bouncer_auth_mode = 'md5',
|
||||
String $pl_bouncer_auth_users = 'placeholder',
|
||||
String $pl_bouncer_pool_mode = 'transaction',
|
||||
String $pl_bouncer_mx_cl_conn = '100',
|
||||
String $pl_bouncer_pool_size = '20',
|
||||
|
||||
) {
|
||||
$fqdn = $facts['networking']['fqdn']
|
||||
@@ -643,15 +798,21 @@ class confdroid_postgresql::params (
|
||||
|
||||
# Directories
|
||||
$pl_data_dir = '/var/lib/pgsql/data/'
|
||||
$pl_bouncer_dir = '/etc/pgbouncer'
|
||||
|
||||
# files
|
||||
$pl_pg_hba_conf = "${pl_data_dir}/pg_hba.conf"
|
||||
$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_bouncer_ini_file = "${pl_bouncer_dir}/pgbouncer.ini"
|
||||
$pl_bouncer_ini_erb = 'confdroid_postgresql/server/bouncer/pgbouncer.ini.erb'
|
||||
$pl_bouncer_auth_file = "${pl_bouncer_dir}/userlist.txt"
|
||||
$pl_bouncer_auth_erb = 'confdroid_postgresql/server/bouncer/bouncer_users.erb'
|
||||
|
||||
# Service
|
||||
$pl_service = 'postgresql'
|
||||
$pl_exporter_service = 'postgres_exporter'
|
||||
$pl_bouncer_service = 'pgbouncer'
|
||||
|
||||
# includes must be last
|
||||
include confdroid_postgresql::main::config
|
||||
|
||||
Reference in New Issue
Block a user