From c43b3d95e27594e40cb173c10f2f81f33e66aa7b Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Fri, 15 May 2020 16:45:03 -0700
Subject: [PATCH] puppet: Switch env-wal-e to use wal-g rather than wal-e.

wal-g is the modern reimplementation of wal-e that supports current
postgres.  It requires a bit of extra configuration to specify the AWS
region.
---
 puppet/zulip/files/postgresql/env-wal-e | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/puppet/zulip/files/postgresql/env-wal-e b/puppet/zulip/files/postgresql/env-wal-e
index c836409ed7..182dd1e6e3 100755
--- a/puppet/zulip/files/postgresql/env-wal-e
+++ b/puppet/zulip/files/postgresql/env-wal-e
@@ -3,6 +3,9 @@ if [ -z "$ZULIP_SECRETS_CONF" ]; then
     ZULIP_SECRETS_CONF=/etc/zulip/zulip-secrets.conf
 fi
 
+export PGHOST=/var/run/postgresql/
+AWS_REGION=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_region)
+export AWS_REGION
 AWS_ACCESS_KEY_ID=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_key)
 export AWS_ACCESS_KEY_ID
 AWS_SECRET_ACCESS_KEY=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_secret_key)
@@ -12,4 +15,4 @@ if ! s3_backups_bucket=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_
     exit 1
 fi
 export WALE_S3_PREFIX=s3://$s3_backups_bucket
-exec /usr/local/bin/wal-e "$@"
+exec /usr/local/bin/wal-g "$@"