X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=b9f781b6d7f5816911155e833042166603b72fd9;hb=c1f216790d3a69239fb0b84cbb9cd50743ed5f0c;hp=aad5d0141fbe86c95efb9e35be3c7c0c1bb58075;hpb=fc2be5215ae49680aeef03cd4b79bb117391d4d0;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 aad5d0141..b9f781b6d 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."
@@ -94,11 +96,12 @@ 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
 sibelius.debian.org	5433	debian-backup		snapshot	9.4
-vittoria.debian.org	5432	debian-backup		main		9.4
-melartin.debian.org	5432	debian-backup		main		9.6
+vittoria.debian.org	5432	debian-backup		main		9.6
 buxtehude.debian.org	5433	debian-backup		main		9.4
-buxtehude.debian.org	5441	debian-backup		main		9.6
-<%- if hostname != "backuphost" -%>
+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