From ae2c377d13ac23c9e72a6f11b61b6e64e76b5947 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 26 Apr 2021 16:11:02 -0700
Subject: [PATCH] postgresql: Switch to defaulting to PostgreSQL 13.

---
 docs/production/postgresql.md        | 11 ++++++-----
 docs/production/upgrade-or-modify.md |  4 ++--
 scripts/lib/install                  |  4 ++--
 scripts/setup/upgrade-postgresql     |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/production/postgresql.md b/docs/production/postgresql.md
index 093e36c38f..3460dd2006 100644
--- a/docs/production/postgresql.md
+++ b/docs/production/postgresql.md
@@ -1,15 +1,16 @@
 PostgreSQL database details
 =========================
 
-Starting with Zulip 3.0, Zulip supports using PostgreSQL 10, 11, or 12,
-defaulting to PostgreSQL 12 for new installations.
+Starting with Zulip 3.0, Zulip supports a range of PostgreSQL
+versions.  PostgreSQL 13 is the current default for new installations;
+PostgreSQL 10, 11, and 12 are all supported.
 
 Previous versions of Zulip used whatever version of PostgreSQL was
 included with the base operating system (E.g. PostgreSQL 12 on Ubuntu
 Focal, 10 on Ubuntu Bionic, and 9.6 on Ubuntu Xenial).  We recommend
-that installations currently using older PostgreSQL releases [upgrade to
-PostgreSQL 12][upgrade-postgresql], as may drop support for older PostgreSQL
-in a future release.
+that installations currently using older PostgreSQL releases [upgrade
+to PostgreSQL 13][upgrade-postgresql], as we may drop support for
+older PostgreSQL in a future release.
 
 [upgrade-postgresql]: ../production/upgrade-or-modify.html#upgrading-postgresql
 
diff --git a/docs/production/upgrade-or-modify.md b/docs/production/upgrade-or-modify.md
index 04acfbbf36..0d13d8e90e 100644
--- a/docs/production/upgrade-or-modify.md
+++ b/docs/production/upgrade-or-modify.md
@@ -403,9 +403,9 @@ instructions for other supported platforms.
 ## Upgrading PostgreSQL
 
 Starting with Zulip 3.0, we use the latest available version of
-PostgreSQL at installation time (currently version 12).  Upgrades to
+PostgreSQL at installation time (currently version 13).  Upgrades to
 the version of PostgreSQL are no longer linked to upgrades of the
-distribution; that is, you may opt to upgrade to PostgreSQL 12 while
+distribution; that is, you may opt to upgrade to PostgreSQL 13 while
 running Ubuntu 18.04 Bionic.
 
 To upgrade the version of PostgreSQL on the Zulip server:
diff --git a/scripts/lib/install b/scripts/lib/install
index 1e4f84d55e..fa3378d7bb 100755
--- a/scripts/lib/install
+++ b/scripts/lib/install
@@ -28,7 +28,7 @@ Options:
       install process; used when this command is run once in a highly-controlled
       environment to produce an image which is used elsewhere.  Uncommon.
 
-  --postgresql-version=12
+  --postgresql-version=13
       Sets the version of PostgreSQL that will be installed.
   --postgresql-missing-dictionaries
       Set postgresql.missing_dictionaries, which alters the initial database.  Use with
@@ -127,7 +127,7 @@ read -r -a ADDITIONAL_PACKAGES <<<"${ADDITIONAL_PACKAGES:-}"
 # e.g. zulip::profile::app_frontend for a Zulip frontend server.
 PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::profile::standalone}"
 VIRTUALENV_NEEDED="${VIRTUALENV_NEEDED:-yes}"
-POSTGRESQL_VERSION="${POSTGRESQL_VERSION:-12}"
+POSTGRESQL_VERSION="${POSTGRESQL_VERSION:-13}"
 
 if [ -n "$SELF_SIGNED_CERT" ] && [ -n "$USE_CERTBOT" ]; then
     set +x
diff --git a/scripts/setup/upgrade-postgresql b/scripts/setup/upgrade-postgresql
index 6f58de8f92..64fa250912 100755
--- a/scripts/setup/upgrade-postgresql
+++ b/scripts/setup/upgrade-postgresql
@@ -6,7 +6,7 @@ if [ "$EUID" -ne 0 ]; then
     exit 1
 fi
 
-UPGRADE_TO=${1:-12}
+UPGRADE_TO=${1:-13}
 UPGRADE_FROM=$(crudini --get /etc/zulip/zulip.conf postgresql version)
 ZULIP_PATH="$(dirname "$0")/../.."