3
0

Recommit for updates in build 11

This commit is contained in:
2025-12-05 14:24:23 +01:00
parent 9062323222
commit 6621a252f3
21 changed files with 815 additions and 33 deletions

View File

@@ -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>&#39;pgbouncer&#39;</tt>)</em>
&mdash;
<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>&#39;pgbouncer&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;0.0.0.0&#39;</tt>)</em>
&mdash;
<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>&#39;6432&#39;</tt>)</em>
&mdash;
<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>&#39;md5&#39;</tt>)</em>
&mdash;
<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>&#39;placeholder&#39;</tt>)</em>
&mdash;
<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>&#39;transaction&#39;</tt>)</em>
&mdash;
<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>&#39;100&#39;</tt>)</em>
&mdash;
<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>&#39;20&#39;</tt>)</em>
&mdash;
<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 = &#39;0.0.0.0&#39;,
String $pl_bouncer_port = &#39;6432&#39;,
String $pl_bouncer_auth_mode = &#39;md5&#39;,
String $pl_bouncer_auth_users = &#39;placeholder&#39;,
String $pl_bouncer_pool_mode = &#39;transaction&#39;,
String $pl_bouncer_mx_cl_conn = &#39;100&#39;,
String $pl_bouncer_pool_size = &#39;20&#39;,
) {
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
@@ -643,15 +798,21 @@ class confdroid_postgresql::params (
# Directories
$pl_data_dir = &#39;/var/lib/pgsql/data/&#39;
$pl_bouncer_dir = &#39;/etc/pgbouncer&#39;
# files
$pl_pg_hba_conf = &quot;${pl_data_dir}/pg_hba.conf&quot;
$pl_pg_hba_rule_conf = &#39;confdroid_postgresql/server/pghba/pg_hba_rule.conf.erb&#39;
$pl_pg_hba_conf_erb = &#39;confdroid_postgresql/server/pghba/pg_hba.conf.erb&#39;
$pl_bouncer_ini_file = &quot;${pl_bouncer_dir}/pgbouncer.ini&quot;
$pl_bouncer_ini_erb = &#39;confdroid_postgresql/server/bouncer/pgbouncer.ini.erb&#39;
$pl_bouncer_auth_file = &quot;${pl_bouncer_dir}/userlist.txt&quot;
$pl_bouncer_auth_erb = &#39;confdroid_postgresql/server/bouncer/bouncer_users.erb&#39;
# Service
$pl_service = &#39;postgresql&#39;
$pl_exporter_service = &#39;postgres_exporter&#39;
$pl_bouncer_service = &#39;pgbouncer&#39;
# includes must be last
include confdroid_postgresql::main::config