From b3260bd6102bd8d58ac4fd6c4a272a6c96848684 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 22 Feb 2022 20:15:21 -0800 Subject: [PATCH] docs: Use Debian and Ubuntu version numbers over development codenames. Signed-off-by: Anders Kaseorg --- .github/workflows/production-suite.yml | 6 ++-- .github/workflows/zulip-ci.yml | 4 +-- docs/overview/changelog.md | 34 +++++++++---------- docs/production/upgrade-or-modify.md | 26 +++++++------- .../zulip_ops/templates/munin/munin.conf.erb | 2 +- tools/ci/Dockerfile.prod | 2 +- tools/lib/provision.py | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/production-suite.yml b/.github/workflows/production-suite.yml index 8ff5d147e3..68d3ccd469 100644 --- a/.github/workflows/production-suite.yml +++ b/.github/workflows/production-suite.yml @@ -110,17 +110,17 @@ jobs: # Docker images are built from 'tools/ci/Dockerfile'; the comments at # the top explain how to build and upload these images. - docker_image: zulip/ci:focal - name: Focal production install + name: Ubuntu 20.04 production install os: focal extra_args: "" - docker_image: zulip/ci:buster - name: Buster production install with custom db name and user + name: Debian 10 production install with custom db name and user os: buster extra_args: --test-custom-db - docker_image: zulip/ci:bullseye - name: Bullseye production install + name: Debian 11 production install os: bullseye extra_args: "" diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml index 22a3778094..c1024bb15a 100644 --- a/.github/workflows/zulip-ci.yml +++ b/.github/workflows/zulip-ci.yml @@ -23,13 +23,13 @@ jobs: name: Debian 10 Buster (Python 3.7, backend + frontend) os: buster include_frontend_tests: true - # Focal ships with Python 3.8.2. + # Ubuntu 20.04 ships with Python 3.8.2. - docker_image: zulip/ci:focal name: Ubuntu 20.04 Focal (Python 3.8, backend) os: focal is_focal: true include_frontend_tests: false - # Bullseye ships with Python 3.9.2. + # Debian 11 ships with Python 3.9.2. - docker_image: zulip/ci:bullseye name: Debian 11 Bullseye (Python 3.9, backend) os: bullseye diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index b8babd0579..10fae31506 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -141,7 +141,7 @@ log][commit-log] for an up-to-date list of raw changes. updating the operating system hosting PostgreSQL, which previously omitted some indexes from its verification. If you updated the operating system of your Zulip instance from Ubuntu 18.04 to 20.04, - or from Debian Stretch to Debian Buster, you should run the tool, + or from Debian 9 to 10, you should run the tool, even if you did so previously; full details and instructions are available in the previous blog post. - Began routing requests from the Camo image proxy through a @@ -422,8 +422,8 @@ log][commit-log] for an up-to-date list of raw changes. - Added API endpoint to fetch presence details by user ID. - Added new LDAP configuration options for servers hosting multiple organizations. - Added new `@**|user_id**` mention syntax intended for use in bots. -- Added preliminary support for Zulip on Debian Bullseye; this - release is expected to support Bullseye without any further changes. +- Added preliminary support for Zulip on Debian 11; this + release is expected to support Debian 11 without any further changes. - Added several useful new management commands, including `change_realm_subdomain` and `delete_user`. - Added support for subscribing all members of a user group to a stream. @@ -841,7 +841,7 @@ log][commit-log] for an up-to-date list of raw changes. ### 2.1.6 -- 2020-06-17 - Fixed use of Python 3.6+ syntax in 2.1.5 release that prevented - installation on Ubuntu Xenial. + installation on Ubuntu 16.04. ### 2.1.5 -- 2020-06-16 @@ -953,7 +953,7 @@ details. #### Highlights -- Added support for Debian buster. Removed support for EOL Ubuntu Trusty. +- Added support for Debian 10. Removed support for EOL Ubuntu 14.04. - Added support for SAML authentication. - Removed our dependency on `tsearch_extras`, making it possible to run a production Zulip server against any PostgreSQL database @@ -1195,7 +1195,7 @@ details. ### 2.0.6 -- 2019-09-23 -- Updated signing keys for the PGroonga repository for Debian Stretch. +- Updated signing keys for the PGroonga repository for Debian 9. - Fixed creation of linkifiers with URLs containing &. - Fixed a subtle bug that could cause the message list to suddenly scroll up in certain rare race conditions. @@ -1204,7 +1204,7 @@ details. - CVE-2019-16215: Fix DoS vulnerability in Markdown LINK_RE. - CVE-2019-16216: Fix MIME type validation. -- Fixed email gateway postfix configuration for Ubuntu Bionic. +- Fixed email gateway postfix configuration for Ubuntu 18.04. - Fixed support for hidden_by_limit messages in Slack import. - Fixed confusing output from the `knight` management command. @@ -1244,7 +1244,7 @@ details. ### 2.0.1 -- 2019-03-04 -- Fixed handling of uploaded file routing on Ubuntu Trusty. +- Fixed handling of uploaded file routing on Ubuntu 14.04. - Fixed buggy behavior of branding logos in night theme. - Fixed handling of deployment directories being owned by root. - The styling of "unavailable" status icons is now less prominent. @@ -1273,9 +1273,9 @@ details. Our HipChat and Slack import tools are now well-tested with millions of messages, 10,000s of users, and 100,000s of uploaded files. - Added a built-in tool for backups and restoration. -- Deprecated support for Ubuntu Trusty. Zulip 2.0.x will continue to - support Ubuntu Trusty, but Zulip 2.1.0 will remove support for - installing on Trusty. +- Deprecated support for Ubuntu 14.04. Zulip 2.0.x will continue to + support Ubuntu 14.04, but Zulip 2.1.0 will remove support for + installing on Ubuntu 14.04. #### Upgrade notes for 2.0.0 @@ -1390,10 +1390,10 @@ Zulip installations; it has minimal changes for existing servers. #### Highlights -- Support for Ubuntu bionic and Debian stretch (our first non-Ubuntu +- Support for Ubuntu 18.04 and Debian 9 (our first non-Ubuntu platform!). We expect to deprecate support for installing a new - Zulip server on Ubuntu Trusty in the coming months, in preparation - for Trusty’s end-of-life in April 2019. + Zulip server on Ubuntu 14.04 in the coming months, in preparation + for Ubuntu 14.04’s end-of-life in April 2019. - New data import tools for HipChat and Gitter. The Slack importer is now out of beta. - Zulip Python process startup time is about 30% faster; this effort @@ -1549,9 +1549,9 @@ Zulip installations; it has minimal changes for existing servers. organization administrators can remove users, edit descriptions, and rename private streams they are not subscribed to. See Zulip's security model documentation for details. -- On Xenial, the local uploads backend now does the same security +- On Ubuntu 16.04, the local uploads backend now does the same security checks that the S3 backend did before serving files to users. - Ubuntu Trusty's version of nginx is too old to support this and so + Ubuntu 14.04's version of nginx is too old to support this and so the legacy model is the default; we recommend upgrading. - Added an organization setting to limit creation of bots. - Refactored the authentication backends codebase to be much easier to @@ -2218,7 +2218,7 @@ running a version from before 1.7 should upgrade directly to 1.7.1. - Fixed unnecessary loading of zxcvbn password strength checker. This saves a huge fraction of the uncached network transfer for loading Zulip. -- Added support for using Ubuntu Xenial in production. +- Added support for using Ubuntu 16.04 in production. - Added a powerful and complete realm import/export tool. - Added nice UI for selecting a default language to display settings. - Added UI for searching streams in left sidebar with hotkeys. diff --git a/docs/production/upgrade-or-modify.md b/docs/production/upgrade-or-modify.md index 12ca8f19df..87aa459ef2 100644 --- a/docs/production/upgrade-or-modify.md +++ b/docs/production/upgrade-or-modify.md @@ -323,9 +323,9 @@ instructions for other supported platforms. only upgrade to Zulip 3.0 and newer after completing this process, since newer releases don't support Ubuntu 16.04 Xenial. -2. Same as for Bionic to Focal. +2. Same as for Ubuntu 18.04 to 20.04. -3. Same as for Bionic to Focal. +3. Same as for Ubuntu 18.04 to 20.04. 4. As root, upgrade the database installation and OS configuration to match the new OS version: @@ -364,8 +364,8 @@ instructions for other supported platforms. /home/zulip/deployments/current/manage.py audit_fts_indexes ``` -8. [Upgrade from Bionic to - Focal](#upgrading-from-ubuntu-18-04-bionic-to-20-04-focal), so that +8. [Upgrade from Ubuntu 18.04 to + 20.04](#upgrading-from-ubuntu-18-04-bionic-to-20-04-focal), so that you are running a supported operating system. ### Upgrading from Ubuntu 14.04 Trusty to 16.04 Xenial @@ -374,9 +374,9 @@ instructions for other supported platforms. only upgrade to Zulip `2.1.x` and newer after completing this process, since newer releases don't support Ubuntu 14.04 Trusty. -2. Same as for Bionic to Focal. +2. Same as for Ubuntu 18.04 to 20.04. -3. Same as for Bionic to Focal. +3. Same as for Ubuntu 18.04 to 20.04. 4. As root, upgrade the database installation and OS configuration to match the new OS version: @@ -407,11 +407,11 @@ instructions for other supported platforms. able to navigate to its URL and confirm everything is working correctly. -6. [Upgrade from Xenial to - Bionic](#upgrading-from-ubuntu-16-04-xenial-to-18-04-bionic), so +6. [Upgrade from Ubuntu 16.04 to + 18.04](#upgrading-from-ubuntu-16-04-xenial-to-18-04-bionic), so that you are running a supported operating system. -### Upgrading from Debian Buster to Debian Bullseye +### Upgrading from Debian 10 to 11 1. Upgrade your server to the latest Zulip `4.x` release. @@ -455,7 +455,7 @@ instructions for other supported platforms. be able to navigate to its URL and confirm everything is working correctly. -6. Debian Bullseye has a different version of the low-level glibc +6. Debian 11 has a different version of the low-level glibc library, which affects how PostgreSQL orders text data (known as "collations"); this corrupts database indexes that rely on collations. Regenerate the affected indexes by running: @@ -472,11 +472,11 @@ instructions for other supported platforms. 8. As an additional step, you can also [upgrade the postgresql version](#upgrading-postgresql). -### Upgrading from Debian Stretch to Debian Buster +### Upgrading from Debian 9 to 10 1. Upgrade your server to the latest Zulip `2.1.x` release. You can only upgrade to Zulip 3.0 and newer after completing this process, - since newer releases don't support Ubuntu Debian Stretch. + since newer releases don't support Debian 9. 2. As the Zulip user, stop the Zulip server and run the following to back up the system: @@ -528,7 +528,7 @@ instructions for other supported platforms. 6. [Upgrade to the latest Zulip release](#upgrading-to-a-release), now that your server is running a supported operating system. -7. Debian Buster has a different version of the low-level glibc +7. Debian 10 has a different version of the low-level glibc library, which affects how PostgreSQL orders text data (known as "collations"); this corrupts database indexes that rely on collations. Regenerate the affected indexes by running: diff --git a/puppet/zulip_ops/templates/munin/munin.conf.erb b/puppet/zulip_ops/templates/munin/munin.conf.erb index 90bf1d00ba..f5b75a2fc4 100644 --- a/puppet/zulip_ops/templates/munin/munin.conf.erb +++ b/puppet/zulip_ops/templates/munin/munin.conf.erb @@ -27,7 +27,7 @@ i += 1 end -%> -# Default munin comments from Xenial below +# Default munin comments from Ubuntu 16.04 below # You can choose the time reference for "DERIVE" like graphs, and show # "per minute", "per hour" values instead of the default "per second" diff --git a/tools/ci/Dockerfile.prod b/tools/ci/Dockerfile.prod index b798ae06fb..18966a8fc2 100644 --- a/tools/ci/Dockerfile.prod +++ b/tools/ci/Dockerfile.prod @@ -1,4 +1,4 @@ -# To build these production upgrade test images, say a Debian Buster system +# To build these production upgrade test images, say a Debian 10 Buster system # preinstalled with Zulip 3.4: # docker build . -f Dockerfile.prod --build-arg=BASE_IMAGE=zulip/ci:buster --build-arg=VERSION=3.4 --tag=zulip/ci:buster-3.4 # docker push zulip/ci:buster-3.4 diff --git a/tools/lib/provision.py b/tools/lib/provision.py index d8a0ea60a4..5a211075ae 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -181,7 +181,7 @@ if vendor == "debian" and os_version in [] or vendor == "ubuntu" and os_version elif "debian" in os_families(): DEBIAN_DEPENDECIES = UBUNTU_COMMON_APT_DEPENDENCIES # The below condition is required since libappindicator is - # not available for bullseye (sid). "libgroonga1" is an + # not available for Debian 11. "libgroonga1" is an # additional dependency for postgresql-13-pgdg-pgroonga. # # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037