From e3bd0e42652f5e011958714b98105e3b5bd19d15 Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Wed, 1 Oct 2025 13:57:29 +0200
Subject: [PATCH 1/2] fix parameter name and location see 
 https://gitlab.confdroid.com/internal/confdroid_management/-/issues/235

---
 manifests/params.pp                               | 5 +++--
 templates/{ => server/pghba}/pg_hba.conf.erb      | 0
 templates/{ => server/pghba}/pg_hba_rule.conf.erb | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename templates/{ => server/pghba}/pg_hba.conf.erb (100%)
 rename templates/{ => server/pghba}/pg_hba_rule.conf.erb (100%)

diff --git a/manifests/params.pp b/manifests/params.pp
index a47b23a..5177ffc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -57,8 +57,9 @@ class postgresql_cd::params (
   $pl_data_dir              = '/var/lib/pgsql/data/'
 
   # files
-  $pl_pg_hba_conf        = "${pl_data_dir}/pg_hba.conf"
-  $pl_pg_hba_rule_conf      = 'postgresql_cd/pg_hba_rule.conf.erb'
+  $pl_pg_hba_conf           = "${pl_data_dir}/pg_hba.conf"
+  $pl_pg_hba_rule_conf      = 'postgresql_cd/server/pghba/pg_hba_rule.conf.erb'
+  $pl_pg_hba_conf_erb       = 'postgresql_cd/server/pghba/pg_hba.conf.erb'
 
   # includes must be last
   include postgresql_cd::main::config
diff --git a/templates/pg_hba.conf.erb b/templates/server/pghba/pg_hba.conf.erb
similarity index 100%
rename from templates/pg_hba.conf.erb
rename to templates/server/pghba/pg_hba.conf.erb
diff --git a/templates/pg_hba_rule.conf.erb b/templates/server/pghba/pg_hba_rule.conf.erb
similarity index 100%
rename from templates/pg_hba_rule.conf.erb
rename to templates/server/pghba/pg_hba_rule.conf.erb

From 85c5dd5ee7e25f50810124c544f0709ee0cbb55f Mon Sep 17 00:00:00 2001
From: Jenkins Server <jenkins@confdroid.com>
Date: Wed, 1 Oct 2025 13:58:48 +0200
Subject: [PATCH 2/2] Recommit for updates in build 17

---
 doc/puppet_classes/postgresql_cd_3A_3Aparams.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aparams.html b/doc/puppet_classes/postgresql_cd_3A_3Aparams.html
index c0f13e6..2479581 100644
--- a/doc/puppet_classes/postgresql_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/postgresql_cd_3A_3Aparams.html
@@ -435,7 +435,8 @@
 62
 63
 64
-65</pre>
+65
+66</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 23</span>
@@ -477,8 +478,9 @@ class postgresql_cd::params (
   $pl_data_dir              = &#39;/var/lib/pgsql/data/&#39;
 
   # files
-  $pl_pg_hba_conf        = &quot;${pl_data_dir}/pg_hba.conf&quot;
-  $pl_pg_hba_rule_conf      = &#39;postgresql_cd/pg_hba_rule.conf.erb&#39;
+  $pl_pg_hba_conf           = &quot;${pl_data_dir}/pg_hba.conf&quot;
+  $pl_pg_hba_rule_conf      = &#39;postgresql_cd/server/pghba/pg_hba_rule.conf.erb&#39;
+  $pl_pg_hba_conf_erb       = &#39;postgresql_cd/server/pghba/pg_hba.conf.erb&#39;
 
   # includes must be last
   include postgresql_cd::main::config