X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server%2Fregister_backup_cluster.pp;h=bc16a764677ca36c595e8275b0b31e8be26b926c;hb=8af635702921a5ae19a067043421a9b4fa8c3f58;hp=0fd482cdb54b518fdd4d87f57291407d5daa7361;hpb=b07d4828f3f22e9f4c80709ce2948174f9c1124f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_server/register_backup_cluster.pp b/modules/postgres/manifests/backup_server/register_backup_cluster.pp
index 0fd482cdb..bc16a7646 100644
--- a/modules/postgres/manifests/backup_server/register_backup_cluster.pp
+++ b/modules/postgres/manifests/backup_server/register_backup_cluster.pp
@@ -1,41 +1,50 @@
 #
+# Cause our pg backup servers to run base backups of
+# this postgres cluster and add the cluster to the
+# monitoring configuration.
+#
+# @param hostname     name of the db server
+# @param fqdn         fqdn of the db server
+# @param pg_port      port of the postgres cluster
+# @param pg_role      replication role username
+# @param pg_password  password of the replication role
+# @param pg_cluster   cluster name
+# @param pg_version   pg version of the cluster
 define postgres::backup_server::register_backup_cluster (
-  $hostname = $::hostname,
-  $fqdn = $::fqdn,
-  $pg_port,
-  $pg_role,
-  $pg_password,
-  $pg_cluster,
-  $pg_version,
+  Integer $pg_port,
+  String $pg_role,
+  String $pg_password,
+  String $pg_cluster,
+  String $pg_version,
+  String $hostname = $::hostname,
+  String $fqdn = $::fqdn,
 ) {
   include postgres::backup_server::globals
 
   # foobar.debian.org:5432:*:debian-backup:swordfish
-  @@concat::fragment { "postgresql::server::backup-source-pgpassline::$hostname::$pg_port::$pg_role":
-    target => $postgres::backup_server::globals::pgpassfile,
+  @@concat::fragment { "postgresql::server::backup-source-pgpassline::${hostname}::${pg_port}::${pg_role}":
+    target  => $postgres::backup_server::globals::pgpassfile,
     content => @("EOF"),
         ${fqdn}:${pg_port}:*:${pg_role}:${pg_password}
         | EOF
     tag     => $postgres::backup_server::globals::tag_source_pgpassline,
   }
-  #
-  # vittoria.debian.org  5432  debian-backup    main    9.6
-  @@concat::fragment { "postgresql::server::backup-source-make-base-backup-entry::$hostname::$pg_port::$pg_role":
-    target => $postgres::backup_server::globals::make_base_backups,
-    content => @("EOF"),
-        ${fqdn}  ${pg_port}  ${pg_role}  ${pg_cluster}  ${pg_version}
-        | EOF
+  # example entry:
+  #   vittoria.debian.org  5432  debian-backup    main    9.6
+  @@concat::fragment { "postgresql::server::backup-source-make-base-backup-entry::${hostname}::${pg_port}::${pg_role}":
     tag     => $postgres::backup_server::globals::tag_base_backup,
+    target  => $postgres::backup_server::globals::base_backup_clusters,
+    content => "${::fqdn} ${pg_port} ${pg_role} ${pg_cluster} ${pg_version}",
   }
 
   @@file { "/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/${hostname}-${pg_cluster}.conf":
-    content  => @("EOF"),
+    content => @("EOF"),
         --- 
         backups:
           ${hostname}:
             ${pg_cluster}:
         | EOF
     tag     => $postgres::backup_server::globals::tag_dsa_check_backupp,
-    notify  => Exec['update dsa-check-backuppg-manual.conf']
+    notify  => Exec['update dsa-check-backuppg.conf']
   }
 }