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=5fffbe18f4c7134aa14db4ae2afc03f6efce81d9;hp=44a1e42d47639a8ed8ece522379d178debc63ae6;hpb=0c17090552d7b68ae9ddf4a6a270159489f80070;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 44a1e42d4..bc16a7646 100644
--- a/modules/postgres/manifests/backup_server/register_backup_cluster.pp
+++ b/modules/postgres/manifests/backup_server/register_backup_cluster.pp
@@ -11,19 +11,19 @@
 # @param pg_cluster   cluster name
 # @param pg_version   pg version of the cluster
 define postgres::backup_server::register_backup_cluster (
-  String $hostname = $::hostname,
-  String $fqdn = $::fqdn,
   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
@@ -31,7 +31,7 @@ define postgres::backup_server::register_backup_cluster (
   }
   # 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":
+  @@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}",
@@ -44,7 +44,7 @@ define postgres::backup_server::register_backup_cluster (
           ${hostname}:
             ${pg_cluster}:
         | EOF
-    tag    => $postgres::backup_server::globals::tag_dsa_check_backupp,
-    notify => Exec['update dsa-check-backuppg-manual.conf']
+    tag     => $postgres::backup_server::globals::tag_dsa_check_backupp,
+    notify  => Exec['update dsa-check-backuppg.conf']
   }
 }