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=HEAD;hp=b0e65efffa5d4823e7593edf6d385336c844f6e9;hpb=7e22e08a43a59c1bfa91c3ca009e5222430b47be;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 b0e65efff..8e19a3a11 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -41,6 +41,11 @@ 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 <%= scope['postgres::backup_server::globals::backup_unix_user'] %>."
+    exit 1
+fi
+
 SELF="`basename "$0"`[$$]"
 DELTA_WAIT_SUCCESS=$(( MAX_WAIT_SUCCESS - MIN_WAIT_SUCCESS ))
 MYHOSTNAME=$(hostname -f)
@@ -159,13 +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	5436	debian-backup		wannabuild	9.6
-bmdb1.debian.org	5440	debian-backup		debsources	9.6
-fasolo.debian.org	5433	debian-backup		dak		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'] %>'