From 1ba2f39854c657fc9db750a0cbd0e59127173fef Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Thu, 21 Dec 2023 20:46:51 +0000
Subject: [PATCH] install: Support PostgreSQL 16.

---
 docs/production/deployment.md                | 4 ++--
 docs/production/postgresql.md                | 4 ++--
 puppet/zulip/manifests/profile/postgresql.pp | 2 +-
 scripts/lib/install                          | 4 ++--
 scripts/setup/upgrade-postgresql             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/production/deployment.md b/docs/production/deployment.md
index 5d36f45ca5..332e025d65 100644
--- a/docs/production/deployment.md
+++ b/docs/production/deployment.md
@@ -52,8 +52,8 @@ as well as those mentioned in the
 [install](install.md#installer-options) documentation:
 
 - `--postgresql-version`: Sets the version of PostgreSQL that will be
-  installed. We currently support PostgreSQL 12, 13, 14, and 15, with 15 being
-  the default.
+  installed. We currently support PostgreSQL 12, 13, 14, 15, and 16, with 16
+  being the default.
 
 - `--postgresql-database-name=exampledbname`: With this option, you
   can customize the default database name. If you do not set this. The
diff --git a/docs/production/postgresql.md b/docs/production/postgresql.md
index 2e19a630d0..5d08fc82f5 100644
--- a/docs/production/postgresql.md
+++ b/docs/production/postgresql.md
@@ -1,8 +1,8 @@
 # PostgreSQL database details
 
 Starting with Zulip 3.0, Zulip supports a range of PostgreSQL
-versions. PostgreSQL 15 is the current default for new installations;
-PostgreSQL 12, 13, 14, and 15 are all supported.
+versions. PostgreSQL 16 is the current default for new installations;
+PostgreSQL 12, 13, 14, 15, and 16 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
diff --git a/puppet/zulip/manifests/profile/postgresql.pp b/puppet/zulip/manifests/profile/postgresql.pp
index 8f4ec3b5ae..202cae0076 100644
--- a/puppet/zulip/manifests/profile/postgresql.pp
+++ b/puppet/zulip/manifests/profile/postgresql.pp
@@ -40,7 +40,7 @@ class zulip::profile::postgresql {
       mode    => '0644',
       content => template("zulip/postgresql/${version}/postgresql.conf.template.erb"),
     }
-  } elsif $version in ['15'] {
+  } elsif $version in ['15', '16'] {
     $postgresql_conf_file = "${zulip::postgresql_base::postgresql_confdir}/conf.d/zulip.conf"
     file { $postgresql_conf_file:
       ensure  => file,
diff --git a/scripts/lib/install b/scripts/lib/install
index fdf59b9def..71cb215386 100755
--- a/scripts/lib/install
+++ b/scripts/lib/install
@@ -32,7 +32,7 @@ Options:
       Sets the PostgreSQL database name.
   --postgresql-database-user=zulip
       Sets the PostgreSQL database user.
-  --postgresql-version=15
+  --postgresql-version=16
       Sets the version of PostgreSQL that will be installed.
   --postgresql-missing-dictionaries
       Set postgresql.missing_dictionaries, which alters the initial database.  Use with
@@ -152,7 +152,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:-15}"
+POSTGRESQL_VERSION="${POSTGRESQL_VERSION:-16}"
 
 if [ -n "$SELF_SIGNED_CERT" ] && [ -n "$USE_CERTBOT" ]; then
     set +x
diff --git a/scripts/setup/upgrade-postgresql b/scripts/setup/upgrade-postgresql
index d75deb6d17..e2d2c35949 100755
--- a/scripts/setup/upgrade-postgresql
+++ b/scripts/setup/upgrade-postgresql
@@ -12,7 +12,7 @@ export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 export LANGUAGE=C.UTF-8
 
-LATEST_SUPPORTED_VERSION=15
+LATEST_SUPPORTED_VERSION=16
 UPGRADE_TO=${1:-$LATEST_SUPPORTED_VERSION}
 UPGRADE_FROM=$(crudini --get /etc/zulip/zulip.conf postgresql version)
 ZULIP_PATH="$(dirname "$0")/../.."