X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fpostgres%2Ffiles%2Fbackup_server%2Fpostgres-make-base-backups;h=691b13ab847b1f619333b02cd86cb70e2ce6c69a;hb=521f2b44087bbe30746020a2aba93f317995791a;hp=e3e6d7f769c19b6e1ea9b52ea08b43e72b03a4e4;hpb=fe22b3b8f19a26c1c1d698e17c048f402246d183;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 e3e6d7f7..691b13ab 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"
@@ -86,11 +87,11 @@ while read host port username  cluster version; do
 	fi
 	mv "$tmp" "$ROOTDIR/${host%%.*}/$target"
 done << EOF
-chopin.debian.org	5432	debian-backup		dak		9.1
-bmdb1.debian.org	5435	debian-backup		main		9.1
-bmdb1.debian.org	5436	debian-backup		wanna-build	9.1
-bmdb1.debian.org	5436	debian-backup		wanna-build-ports	9.1
-danzi.debian.org	5433	debian-backup		main		9.1
-franck.debian.org	5433	debian-backup		dak		9.1
-sibelius.debian.org	5433	debian-backup		snapshot	9.1
+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.4
+franck.debian.org	5433	debian-backup		dak		9.4
+sibelius.debian.org	5433	debian-backup		snapshot	9.4
+moszumanska.debian.org	5432	debian-backup		main		9.1
 EOF