From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Tue, 10 Jun 2014 19:51:37 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3f8b6622ad97a0f9006b75306f364b4ba50f9b6f;hp=53c68059687237d72001ec87d231fdca2db069e5;p=dsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
---

diff --git a/modules/autofs/files/leaseweb/auto.dsa b/modules/autofs/files/leaseweb/auto.dsa
index 53edd6db..aa09a8f0 100644
--- a/modules/autofs/files/leaseweb/auto.dsa
+++ b/modules/autofs/files/leaseweb/auto.dsa
@@ -2,3 +2,4 @@ snapshot-1              -fstype=nfs,ro,tcp     10.0.0.1:/storage/snapshot-farm-1
 snapshot-2              -fstype=nfs,ro,tcp     10.0.0.2:/storage/snapshot-farm-2
 snapshot-3              -fstype=nfs,ro,tcp     10.0.0.3:/storage/snapshot-farm-3
 snapshot-4              -fstype=nfs,ro,tcp     10.0.0.4:/storage/snapshot-farm-4
+morgue.debian.org       -fstype=nfs,ro,tcp     10.0.0.3:/srv/morgue.debian.org
diff --git a/modules/postgres/files/backup_server/postgres-make-base-backups b/modules/postgres/files/backup_server/postgres-make-base-backups
index 9a9d1880..d96aeee7 100755
--- a/modules/postgres/files/backup_server/postgres-make-base-backups
+++ b/modules/postgres/files/backup_server/postgres-make-base-backups
@@ -47,6 +47,18 @@ else
 	console=""
 fi
 
+if [ "${1:-}" = "-h" ] || [ "${1:-}" = "--help" ]; then
+	echo "Usage: $0 [<host>:<port>]"
+	exit 0
+fi
+
+if [ "$#" -gt 0 ]; then
+	forcehostport="$1"
+	shift
+else
+	forcehostport=""
+fi
+
 export PGSSLMODE=verify-full
 export PGSSLROOTCERT=/etc/ssl/debian/certs/ca.crt
 
@@ -55,6 +67,11 @@ date=$(date "+%Y%m%d-%H%M%S")
 while read host port username  cluster version; do
 	[ "${host#\#}" = "$host" ] || continue
 
+	if [ -n "$forcehostport" ] && [ "$forcehostport" != "$host:$port" ]; then
+		[ "$verbose" -gt 0 ] && echo "Skipping $host:$port $version/$cluster."
+		continue
+	fi
+
 	label="$date-$host-$cluster-$version-backup"
 	[ "$verbose" -gt 0 ] && echo "Doing $host:$port $version/$cluster: $label"