From 544e8c569e8ffb788d70119e5834d42134524b42 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Sat, 6 Nov 2021 02:10:55 +0000 Subject: [PATCH] install: Switch default to PostgreSQL 14. --- docs/production/deployment.md | 2 +- docs/production/postgresql.md | 6 +++--- docs/production/upgrade-or-modify.md | 4 ++-- scripts/lib/install | 4 ++-- scripts/setup/upgrade-postgresql | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/production/deployment.md b/docs/production/deployment.md index 43d7fbd354..de53b29842 100644 --- a/docs/production/deployment.md +++ b/docs/production/deployment.md @@ -52,7 +52,7 @@ as well as those mentioned in the [install](../production/install.html#installer-options) documentation: - `--postgresql-version`: Sets the version of PostgreSQL that will be - installed. We currently support PostgreSQL 10, 11, 12, and 13. + installed. We currently support PostgreSQL 10, 11, 12, 13, and 14. - `--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 42d10e9763..e64d527857 100644 --- a/docs/production/postgresql.md +++ b/docs/production/postgresql.md @@ -1,14 +1,14 @@ # PostgreSQL database details 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. +versions. PostgreSQL 14 is the current default for new installations; +PostgreSQL 10, 11, 12, and 13 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 13][upgrade-postgresql], as we may drop support for +to PostgreSQL 14][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 4e59237cd8..31b1e808fb 100644 --- a/docs/production/upgrade-or-modify.md +++ b/docs/production/upgrade-or-modify.md @@ -541,9 +541,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 13). Upgrades to +PostgreSQL at installation time (currently version 14). Upgrades to the version of PostgreSQL are no longer linked to upgrades of the -distribution; that is, you may opt to upgrade to PostgreSQL 13 while +distribution; that is, you may opt to upgrade to PostgreSQL 14 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 735c00a763..2edc4021d3 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=13 + --postgresql-version=14 Sets the version of PostgreSQL that will be installed. --postgresql-missing-dictionaries Set postgresql.missing_dictionaries, which alters the initial database. Use with @@ -140,7 +140,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:-13}" +POSTGRESQL_VERSION="${POSTGRESQL_VERSION:-14}" if [ -n "$SELF_SIGNED_CERT" ] && [ -n "$USE_CERTBOT" ]; then set +x diff --git a/scripts/setup/upgrade-postgresql b/scripts/setup/upgrade-postgresql index 9e66bf018f..37bc8f8e71 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:-13} +UPGRADE_TO=${1:-14} UPGRADE_FROM=$(crudini --get /etc/zulip/zulip.conf postgresql version) ZULIP_PATH="$(dirname "$0")/../.."