X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=2e6d7bed5443dcbbe8939fa476f78f1831c1632c;hb=e36362547be940d1581764ef7be5f984d6d78039;hp=89c9ab19aa701f29d54d62c713923b6d62ea8373;hpb=2a8a342dfa888e6ccd8ade35e225c07f17627442;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 89c9ab19a..2e6d7bed5 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # run a bunch of full postgresql backups
+# vim:syn=sh:
 
 
 # Copyright 2014 Peter Palfrader
@@ -67,6 +68,7 @@ thishost=$(hostname -f)
 
 while read host port username  cluster version; do
 	[ "${host#\#}" = "$host" ] || continue
+	[ -z "$host" ] && continue
 
 	if [ -n "$forcehostport" ] && [ "$forcehostport" != "$host:$port" ]; then
 		[ "$verbose" -gt 0 ] && echo "Skipping $host:$port $version/$cluster."
@@ -87,18 +89,15 @@ while read host port username  cluster version; do
 	fi
 	mv "$tmp" "$ROOTDIR/${host%%.*}/$target"
 done << EOF
-seger.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
-bmdb1.debian.org	5440	debian-backup		debsources	9.4
-danzi.debian.org	5433	debian-backup		main		9.4
-fasolo.debian.org	5433	debian-backup		dak		9.4
+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
 sibelius.debian.org	5433	debian-backup		snapshot	9.4
-vittoria.debian.org	5432	debian-backup		main		9.6
-melartin.debian.org	5432	debian-backup		main		9.6
-buxtehude.debian.org	5433	debian-backup		main		9.4
-buxtehude.debian.org	5441	debian-backup		debbugs		9.6
 <%- if @hostname != "backuphost" -%>
 moszumanska.debian.org	5432	debian-backup		main		9.1
 <%- end -%>
-EOF
+#
+# puppet notice:  this is just a partial file.  The tail EOF comes
+# from a different concat fragment