X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpostgresql%2Fserver.pp;h=cd774baad8fddf24d5cf30791af16327006a3b15;hb=483ee60efd32db8ba0777e569fd72592cfee7bf6;hp=785bc0936ce75dc33e086f08e15c1caab440c968;hpb=530a368c8a8e40d8b115989dcef7bae700099c01;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/postgresql/server.pp b/modules/roles/manifests/postgresql/server.pp
index 785bc0936..cd774baad 100644
--- a/modules/roles/manifests/postgresql/server.pp
+++ b/modules/roles/manifests/postgresql/server.pp
@@ -1,25 +1,20 @@
 #
 # postgresql server role
 #
-class roles::postgresql::server {
-  include postgres::backup_source
-
+# @param manage_clusters_hba manage clusters' pg_hba.conf using postgres::cluster.  Eventually should should be true for every host and we can drop the param
+class roles::postgresql::server(
+  Boolean $manage_clusters_hba = false,
+) {
   $clusters = $facts['postgresql_clusters']
   $clusters.each |$cluster| {
-    # Do not backup clusters that are replication targets,
-    # like the dak mirror or snapshot secondaries
     $version      = $cluster['version']
     $cluster_name = $cluster['cluster']
     $port         = $cluster['port']
-    if ! $cluster['status']['recovery'] {
-      postgres::backup_cluster { "${::hostname}-${version}-${cluster_name}":
-        pg_version => $version,
-        pg_cluster => $cluster_name,
-        pg_port    => $port,
-      }
+    postgres::cluster { 'bacula':
+      pg_version => $version,
+      pg_cluster => $cluster_name,
+      pg_port    => $port,
+      manage_hba => $manage_clusters_hba,
     }
   }
-
-  postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-  }
 }