X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostgres%2Ffiles%2Fbackup_server%2Fpostgres-make-base-backups;h=8b74853c9ef2efc38045ab0a2c8b2a38425907ba;hb=5ae1950ef6a01567d67236bccbb117bb100cf3b2;hp=83567270817ae369b580d5b0d232ee7313d7e8a5;hpb=57e5c2cd777ea92b73118a4e19416ab436983cd7;p=dsa-puppet.git

diff --git a/modules/postgres/files/backup_server/postgres-make-base-backups b/modules/postgres/files/backup_server/postgres-make-base-backups
index 83567270..8b74853c 100755
--- a/modules/postgres/files/backup_server/postgres-make-base-backups
+++ b/modules/postgres/files/backup_server/postgres-make-base-backups
@@ -63,6 +63,7 @@ export PGSSLMODE=verify-full
 export PGSSLROOTCERT=/etc/ssl/debian/certs/ca.crt
 
 date=$(date "+%Y%m%d-%H%M%S")
+thishost=$(hostname -f)
 
 while read host port username  cluster version; do
 	[ "${host#\#}" = "$host" ] || continue
@@ -72,7 +73,7 @@ while read host port username  cluster version; do
 		continue
 	fi
 
-	label="$date-$host-$cluster-$version-backup"
+	label="$thishost-$date-$host-$cluster-$version-backup"
 	[ "$verbose" -gt 0 ] && echo "Doing $host:$port $version/$cluster: $label"
 
 	target="$cluster.BASE.$label.tar.gz"
@@ -89,8 +90,9 @@ done << EOF
 chopin.debian.org	5432	debian-backup		dak		9.4
 bmdb1.debian.org	5435	debian-backup		main		9.4
 bmdb1.debian.org	5436	debian-backup		wannabuild	9.4
-danzi.debian.org	5433	debian-backup		main		9.1
+danzi.debian.org	5433	debian-backup		main		9.4
 franck.debian.org	5433	debian-backup		dak		9.4
-sibelius.debian.org	5433	debian-backup		snapshot	9.1
+sibelius.debian.org	5433	debian-backup		snapshot	9.4
 moszumanska.debian.org	5432	debian-backup		main		9.1
+seger.debian.org	5432	debian-backup		dak		9.4
 EOF