X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=8e19a3a11bdc90fbf300f0da2b17d618761e4375;hb=4b84b19c56499b324af5f25a5fd5ce300db34d0e;hp=8b1124044070c9043d9fbb3414f3a65b1190c82e;hpb=f92fe8826a8086feca4db488d220aac58f5f04eb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index 8b1124044..8e19a3a11 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -42,7 +42,7 @@ STATEDIR=/var/lib/dsa/postgres-make-base-backups
 set -u
 
 if [ "$(id -u)" = 0 ]; then
-    echo >&2 "Do not run me as root.  Probably you want sudo -u debbackup."
+    echo >&2 "Do not run me as root.  Probably you want sudo -u <%= scope['postgres::backup_server::globals::backup_unix_user'] %>."
     exit 1
 fi
 
@@ -164,11 +164,4 @@ while read host port username  cluster version; do
             log "Cannot acquire lock on $flagfile, skipping $host:$port $version/$cluster."
         fi
     fi
-done << EOF
-seger.debian.org	5432	debian-backup		dak		9.6
-bmdb1.debian.org	5435	debian-backup		main		9.6
-bmdb1.debian.org	5440	debian-backup		debsources	9.6
-sallinen.debian.org	5473	debian-backup		snapshot	9.6
-#
-# puppet notice:  this is just a partial file.  The tail EOF comes
-# from a different concat fragment
+done < '<%= scope['postgres::backup_server::globals::base_backup_clusters'] %>'