From 6621a252f3cd0fe7efd037664e972107a5ccdbd7 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 5 Dec 2025 14:24:23 +0100 Subject: [PATCH] Recommit for updates in build 11 --- doc/_index.html | 15 ++ doc/puppet_class_list.html | 14 ++ doc/puppet_classes/confdroid_postgresql.html | 2 +- ..._postgresql_3A_3Abouncer_3A_3Abouncer.html | 208 ++++++++++++++++ ..._postgresql_3A_3Abouncer_3A_3Aservice.html | 146 ++++++++++++ ...id_postgresql_3A_3Aexporter_3A_3Adirs.html | 2 +- ...d_postgresql_3A_3Aexporter_3A_3Afiles.html | 2 +- ...postgresql_3A_3Aexporter_3A_3Aservice.html | 2 +- ...ostgresql_3A_3Afirewall_3A_3Aiptables.html | 2 +- ...roid_postgresql_3A_3Amain_3A_3Aconfig.html | 12 +- ...fdroid_postgresql_3A_3Amain_3A_3Adirs.html | 2 +- ...droid_postgresql_3A_3Amain_3A_3Afiles.html | 2 +- ...oid_postgresql_3A_3Amain_3A_3Ainstall.html | 2 +- .../confdroid_postgresql_3A_3Aparams.html | 187 ++++++++++++++- ...id_postgresql_3A_3Aserver_3A_3Ainitdb.html | 2 +- ...ql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba.html | 2 +- ...d_postgresql_3A_3Aserver_3A_3Aservice.html | 2 +- doc/puppet_defined_type_list.html | 13 +- ...gresql_3A_3Abouncer_3A_3Abouncer_rule.html | 225 ++++++++++++++++++ ...3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html | 2 +- ..._3Aserver_3A_3Apghba_3A_3Apg_hba_rule.html | 4 +- 21 files changed, 815 insertions(+), 33 deletions(-) create mode 100644 doc/puppet_classes/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer.html create mode 100644 doc/puppet_classes/confdroid_postgresql_3A_3Abouncer_3A_3Aservice.html create mode 100644 doc/puppet_defined_types/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer_rule.html diff --git a/doc/_index.html b/doc/_index.html index b659bb1..45d5b97 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,6 +73,16 @@ +
  • + confdroid_postgresql::bouncer::bouncer + +
    • + +
  • + confdroid_postgresql::bouncer::service + +
    • +
  • confdroid_postgresql::exporter::dirs @@ -154,6 +164,11 @@
  • C
    • @@ -538,14 +673,6 @@ 
     
 
-30
-31
-32
-33
-34
-35
-36
-37
 38
 39
 40
@@ -594,10 +721,31 @@
 83
 84
 85
-86
    +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 - 
    # File 'manifests/params.pp', line 30
+        
    # File 'manifests/params.pp', line 38
 
 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
diff --git a/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Ainitdb.html b/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Ainitdb.html
index 94e5612..8f85abe 100644
--- a/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Ainitdb.html
+++ b/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Ainitdb.html
@@ -83,7 +83,7 @@
 
    
   
    
     
-
    confdroid_postgresql::server::initdb.pp Module name: confdroid_postgresql Author: Arne Teuke (arne_teuke@confdroid.com)
    
+
    confdroid_postgresql::server::initdb.pp Module name: confdroid_postgresql Author: 12ww1160 (12ww1160@confdroid.com)
    
 
   
    
 
    
diff --git a/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba.html b/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba.html
index 692094b..9393f44 100644
--- a/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba.html
+++ b/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba.html
@@ -84,7 +84,7 @@ pg_hba_rule.pp
 
    
   
    
     
-
    confdroid_postgresql::server::pg_hba.pp Module name: confdroid_postgresql Author: Arne Teuke (arne_teuke@puppetsoft.com)  }
    
+
    confdroid_postgresql::server::pg_hba.pp Module name: confdroid_postgresql Author: 12ww1160 (arne_teuke@puppetsoft.com)  }
    
 
   
    
 
    
diff --git a/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Aservice.html
index b1b70a4..ddf201c 100644
--- a/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_postgresql_3A_3Aserver_3A_3Aservice.html
@@ -83,7 +83,7 @@
 
    
   
    
     
-
    confdroid_postgresql::server::service.pp Module name: confdroid_postgresql Author: Arne Teuke (arne_teuke@confdroid.com)
    
+
    confdroid_postgresql::server::service.pp Module name: confdroid_postgresql Author: 12ww1160 (12ww1160@confdroid.com)
    
 
   
    
 
    
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index 730f296..cdeeb1b 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -40,21 +40,28 @@
       
      
         
 
-    
    • 
+    
    • 
+      
      
+        confdroid_postgresql::bouncer::bouncer_rule
+      
      
+    
      • 
+    
+
+    
    • 
       
      
         confdroid_postgresql::server::databases::db_df
       
      
     
      • 
     
 
-    
    • 
+    
    • 
       
      
         confdroid_postgresql::server::pghba::pg_hba_rule
       
      
     
      • 
     
 
-    
    • 
+    
    • 
       
      
         confdroid_postgresql::server::roles::role_df
       
      
diff --git a/doc/puppet_defined_types/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer_rule.html b/doc/puppet_defined_types/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer_rule.html
new file mode 100644
index 0000000..fd74482
--- /dev/null
+++ b/doc/puppet_defined_types/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer_rule.html
@@ -0,0 +1,225 @@
+
+
+  
+    
+
+
+  Defined Type: confdroid_postgresql::bouncer::bouncer_rule
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
      
+      
+      
      
+    
      
+
+    
      
+      
+
+      
      Defined Type: confdroid_postgresql::bouncer::bouncer_rule
      
+
      
+  
      
+    
      Defined in:
      
+    
      
+      manifests/bouncer/bouncer_rule.pp
+    
      
+  
      
+
      
+
+  
      Summary
      
+  define manages rule entries for bouncer rules
+
+
      Overview
      
+
      
+  
      
+    
+
      confdroid_postgresql::bouncer::bouncer_rule.pp Module name: confdroid_postgresql Author: 12ww1160 (12ww1160@confdroid.com)
      
+
+  
      
+
      
+
+
+
+
      
+  
      Parameters:
      
+
        
+  
+    
      • 
+      
+        pl_bouncer_db_name
+      
+      
+        (String)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
        
+
        db name for the bouncer rule
        
+
        
+      
+    
        • 
+  
+    
      • 
+      
+        pl_bouncer_host
+      
+      
+        (String)
+      
+      
+        (defaults to: '127.0.0.1')
+      
+      
+        —
+        
        
+
        IP of the db host to bounce to
        
+
        
+      
+    
        • 
+  
+    
      • 
+      
+        pl_bouncer_port
+      
+      
+        (String)
+      
+      
+        (defaults to: '5432')
+      
+      
+        —
+        
        
+
        port of the db host to bounce to
        
+
        
+      
+    
        • 
+  
+    
      • 
+      
+        pl_bounce_order
+      
+      
+        (String)
+      
+      
+        (defaults to: undef)
+      
+      
+    
        • 
+  
+
      
+
+
+
+  
      See Also:
      
+  
+
+
      
+  
+    
+      
+      
+    
+  
      
+        
      +
+
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
      
+            		
+        
      # File 'manifests/bouncer/bouncer_rule.pp', line 10
+
+define confdroid_postgresql::bouncer::bouncer_rule (
+
+  String $pl_bouncer_db_name  = undef,
+  String $pl_bouncer_host     = '127.0.0.1',
+  String $pl_bouncer_port     = '5432',
+  String $pl_bounce_order     = undef,
+
+) {
+  $pl_bouncer_ini_file    = $confdroid_postgresql::params::pl_bouncer_ini_file
+  $pl_bouncer_ini_erb     = $confdroid_postgresql::params::pl_bouncer_ini_erb
+
+  concat::fragment { "pl_bouncer_rule_${name}":
+    target  => $pl_bouncer_ini_file,
+    content => template($pl_bouncer_ini_erb),
+    order   => $pl_bounce_order,
+  }
+}
      
+      
      
+
      
+
      
+
+      
+
+    
      
+  
+
\ No newline at end of file
diff --git a/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html b/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html
index 99d87ea..5d9ce48 100644
--- a/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html
+++ b/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html
@@ -76,7 +76,7 @@
 
      
   
      
     
-
      confdroid_postgresql::server::databases::db_df Module name: confdroid_postgresql Author: Arne Teuke (arne_teuke@confdroid.com.com)
      
+
      confdroid_postgresql::server::databases::db_df Module name: confdroid_postgresql Author: 12ww1160 (12ww1160@confdroid.com.com)
      
 
   
      
 
      
diff --git a/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba_rule.html b/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba_rule.html
index 6f93ac7..9080c6b 100644
--- a/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba_rule.html
+++ b/doc/puppet_defined_types/confdroid_postgresql_3A_3Aserver_3A_3Apghba_3A_3Apg_hba_rule.html
@@ -76,7 +76,7 @@
 
      
   
      
     
-
      confdroid_postgresql::server::pghba::pg_hba_rule Module name: confdroid_postgresql Author: Arne Teuke (arne_teuke@confdroid.com)
      
+
      confdroid_postgresql::server::pghba::pg_hba_rule Module name: confdroid_postgresql Author: 12ww1160 (12ww1160@confdroid.com)
      
 
   
      
 
      
@@ -154,7 +154,7 @@
       
         —
         
      
-
      SPecify IP address or FQDN for the connection, i.e. where to connect FROM.
      
+
      Specify IP address or FQDN for the connection, i.e. where to connect FROM.
      
 
      
       
     
      •