X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=8e19a3a11bdc90fbf300f0da2b17d618761e4375;hb=4b84b19c56499b324af5f25a5fd5ce300db34d0e;hp=023efd9c1434c4221ffd6266ea35b5f988e8d428;hpb=115c498105ac5624f3655195927c09f02706f77e;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 023efd9c1..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)
@@ -96,7 +101,7 @@ while read host port username  cluster version; do
     flagfilesuccess="$STATEDIR/$host-$port.last-success"
     if [ -n "$forcehostport" ]; then
         if [ "$forcehostport" != "$host:$port" ]; then
-            log "Skipping $host:$port $version/$cluster because this run is limited to $host:$port."
+            log "Skipping $host:$port $version/$cluster because this run is limited to $forcehostport."
             runme=0
         else
             log "Forcing $host:$port $version/$cluster run."
@@ -152,19 +157,11 @@ while read host port username  cluster version; do
             log "Running $host:$port $version/$cluster."
             /usr/local/bin/postgres-make-one-base-backup "$host" "$port" "$username" "$cluster" "$version"
             rc=$?
+            log "Base backup for $host:$port $version/$cluster exited with rc $rc."
             [ "$rc" = 0 ] && touch "$flagfilesuccess"
             flock -u 201
         else
             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'] %>'