From: Julien Cristau <jcristau@debian.org>
Date: Fri, 4 Oct 2019 13:47:55 +0000 (+0200)
Subject: Use unique names for pg_hba.conf entries
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=067090ebb5aafec7408e2a0676b857f8235ecbfc

Use unique names for pg_hba.conf entries
---

diff --git a/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/bm.pp b/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/bm.pp
index b3092a31c..3ae4fcb80 100644
--- a/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/bm.pp
+++ b/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/bm.pp
@@ -12,7 +12,7 @@ class roles::postgresql::ftp_master_dak_replica::db_guest_access::bm (
   Enum['local', 'host', 'hostssl'] $connection_type = 'hostssl',
   Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]] $address = $base::public_addresses,
 ) {
-  @@postgres::cluster::hba_entry { "dak-projectb-guest-${::fqdn}":
+  @@postgres::cluster::hba_entry { "dak-projectb-guest-bm-${::fqdn}":
     tag             => "postgres::cluster::${db_port}::hba::${db_address}",
     pg_port         => $db_port,
     database        => $database,
diff --git a/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/ubc.pp b/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/ubc.pp
index 3fff26075..db08d0e3e 100644
--- a/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/ubc.pp
+++ b/modules/roles/manifests/postgresql/ftp_master_dak_replica/db_guest_access/ubc.pp
@@ -12,7 +12,7 @@ class roles::postgresql::ftp_master_dak_replica::db_guest_access::ubc (
   Enum['local', 'host', 'hostssl'] $connection_type = 'hostssl',
   Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]] $address = $base::public_addresses,
 ) {
-  @@postgres::cluster::hba_entry { "dak-projectb-guest-${::fqdn}":
+  @@postgres::cluster::hba_entry { "dak-projectb-guest-ubc-${::fqdn}":
     tag             => "postgres::cluster::${db_port}::hba::${db_address}",
     pg_port         => $db_port,
     database        => $database,