From: Julien Cristau <jcristau@debian.org>
Date: Mon, 9 Sep 2019 08:34:44 +0000 (+0200)
Subject: Don't use versioned pg_basebackup
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=4ca1469d1d8d72cf91b9e5e1eb03349d6e36a868

Don't use versioned pg_basebackup

Use the latest so we know we can pass -X none.  -X fetch causes the
debsources backup to fail with a "requested WAL segment has already been
removed" error.
---

diff --git a/modules/postgres/files/backup_server/postgres-make-one-base-backup b/modules/postgres/files/backup_server/postgres-make-one-base-backup
index ec88bbe12..f8baf1a92 100755
--- a/modules/postgres/files/backup_server/postgres-make-one-base-backup
+++ b/modules/postgres/files/backup_server/postgres-make-one-base-backup
@@ -81,10 +81,10 @@ target="$cluster.BASE.$label.tar.gz"
 tmp=$(tempfile -d "$ROOTDIR" -p "BASE-$host:$port-" -s ".tar.gz")
 trap "rm -f '$tmp'" EXIT
 
-/usr/lib/postgresql/"$version"/bin/pg_basebackup \
+/usr/bin/pg_basebackup \
 	--format=tar \
 	--pgdata=- \
-	-X fetch \
+	-X none \
 	--label="$label" \
 	--host="$host" \
 	--port="$port" \