From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 29 Sep 2019 10:43:19 +0000 (+0200)
Subject: unique postgres::cluster::hba_entry names for hosts with more than one cluster
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=24f01bd918656b09e90cf873698b7b118cdecd97;p=mirror%2Fdsa-puppet.git

unique postgres::cluster::hba_entry names for hosts with more than one cluster
---

diff --git a/modules/postgres/manifests/backup_cluster.pp b/modules/postgres/manifests/backup_cluster.pp
index 7741d9408..cceb94e65 100644
--- a/modules/postgres/manifests/backup_cluster.pp
+++ b/modules/postgres/manifests/backup_cluster.pp
@@ -73,7 +73,7 @@ define postgres::backup_cluster(
     target      => 'pg-backup',
   }
 
-  postgres::cluster::hba_entry { 'backup-replication':
+  postgres::cluster::hba_entry { "backup-replication::${pg_version}::${pg_cluster}":
     pg_version => $pg_version,
     pg_cluster => $pg_cluster,
     pg_port    => $pg_port,
diff --git a/modules/postgres/manifests/cluster/hba_entry.pp b/modules/postgres/manifests/cluster/hba_entry.pp
index e909a3cc5..a7a2f1560 100644
--- a/modules/postgres/manifests/cluster/hba_entry.pp
+++ b/modules/postgres/manifests/cluster/hba_entry.pp
@@ -38,7 +38,7 @@ define postgres::cluster::hba_entry (
   }
 
   if ($address) {
-    ferm::rule::simple { "postgres::cluster::hba_entry::${pg_version}::${pg_cluster}::${name}":
+    ferm::rule::simple { "postgres::cluster::hba_entry::${name}":
       description => "allow access to pg${pg_version}/${pg_cluster}: ${name}",
       saddr       => $address,
       chain       => "pg-${pg_port}",
@@ -58,7 +58,7 @@ define postgres::cluster::hba_entry (
     }
   }
 
-  @concat::fragment { "postgres::cluster::pg_hba::${pg_version}::${pg_cluster}::${name}":
+  @concat::fragment { "postgres::cluster::pg_hba::${name}":
     tag     => "postgres::cluster::${pg_version}::${pg_cluster}::hba",
     target  => "postgres::cluster::${pg_version}::${pg_cluster}::hba",
     order   => $order,