From 491b2ef86c6d102ca31b90c4de1f750ea3f84775 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 5 Dec 2025 16:23:04 +0100 Subject: [PATCH] Recommit for updates in build 23 --- ...d_postgresql_3A_3Abouncer_3A_3Abouncer.html | 10 +++++----- ...postgresql_3A_3Afirewall_3A_3Aiptables.html | 18 +++++++++++++++++- ...tgresql_3A_3Abouncer_3A_3Abouncer_rule.html | 12 ++++++------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/doc/puppet_classes/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer.html b/doc/puppet_classes/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer.html index 359f2b6..70b3220 100644 --- a/doc/puppet_classes/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer.html +++ b/doc/puppet_classes/confdroid_postgresql_3A_3Abouncer_3A_3Abouncer.html @@ -100,11 +100,11 @@

confdroid_postgresql::bouncer::bouncer_rule { ‘test connection’:

-
pl_bouncer_db_name  => 'test',
-pl_bouncer_host     => '127.0.0.7',
-pl_bouncer_port     => '5432',
-pl_bouncer_user     => 'test_user',
-pl_bouncer_order    => '001',
+
pl_bouncer_db_name    => 'test',
+pl_bouncer_host       => '127.0.0.7',
+pl_bouncer_host_port  => '5432',
+pl_bouncer_user       => 'test_user',
+pl_bouncer_order      => '001',
diff --git a/doc/puppet_classes/confdroid_postgresql_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/confdroid_postgresql_3A_3Afirewall_3A_3Aiptables.html index 20ac02e..9ee0e4a 100644 --- a/doc/puppet_classes/confdroid_postgresql_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/confdroid_postgresql_3A_3Afirewall_3A_3Aiptables.html @@ -112,7 +112,15 @@ 14 15 16 -17 +17 +18 +19 +20 +21 +22 +23 +24 +25
# File 'manifests/firewall/iptables.pp', line 6
@@ -127,6 +135,14 @@ class confdroid_postgresql::firewall::iptables (
       dport  => $pl_fw_port,
       jump   => 'accept',
     }
+    if $pl_use_pg_bouncer == true {
+      firewall { "${pl_fw_rule_order}${pl_bouncer_port} tcp port ${pl_bouncer_port}":
+        source => $pl_source_range,
+        proto  => 'tcp',
+        dport  => $pl_bouncer_port,
+        jump   => 'accept',
+      }
+    }
   }
 }
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 index ebae6f7..506e1c5 100644 --- 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 @@ -125,7 +125,7 @@
  • - pl_bouncer_port + pl_bouncer_host_port (String) @@ -220,11 +220,11 @@ 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_bouncer_user = undef, - String $pl_bouncer_order = undef, + String $pl_bouncer_db_name = undef, + String $pl_bouncer_host = '127.0.0.1', + String $pl_bouncer_host_port = '5432', + String $pl_bouncer_user = undef, + String $pl_bouncer_order = undef, ) { $pl_bouncer_ini_file = $confdroid_postgresql::params::pl_bouncer_ini_file