From: Julien Cristau <jcristau@debian.org>
Date: Wed, 4 Sep 2019 14:39:38 +0000 (+0200)
Subject: Fix postgres-make-one-base-backup for pg 11
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=2191dc18f007e608f60af7397b70ffa2b825d5d2

Fix postgres-make-one-base-backup for pg 11

The default was changed to -X stream, which doesn't work when sending to
stdout.  There's no way to disable WAL that works with both 9.6 and 11,
so instead backup redundant WAL files with -X fetch.
---

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 df50652c8..ec88bbe12 100755
--- a/modules/postgres/files/backup_server/postgres-make-one-base-backup
+++ b/modules/postgres/files/backup_server/postgres-make-one-base-backup
@@ -84,6 +84,7 @@ trap "rm -f '$tmp'" EXIT
 /usr/lib/postgresql/"$version"/bin/pg_basebackup \
 	--format=tar \
 	--pgdata=- \
+	-X fetch \
 	--label="$label" \
 	--host="$host" \
 	--port="$port" \