From 0f4b1076ad0f4262aa70e6069deac6d464dcc919 Mon Sep 17 00:00:00 2001 From: Aman Agrawal Date: Fri, 17 Apr 2020 23:30:50 +0530 Subject: [PATCH] scripts: Remove Xenial and Stretch support from installation scripts. Note that we leave support for them in `setup-apt-repo` and puppet, since we're still supporting systems using Xenial for non-appserver puppet rules. --- scripts/lib/check-upstart | 11 ----------- scripts/lib/install | 5 ----- scripts/lib/upgrade-zulip-stage-2 | 3 --- tools/test-install/prepare-base | 2 -- 4 files changed, 21 deletions(-) delete mode 100755 scripts/lib/check-upstart diff --git a/scripts/lib/check-upstart b/scripts/lib/check-upstart deleted file mode 100755 index 605f294996..0000000000 --- a/scripts/lib/check-upstart +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -release=$(lsb_release -sc) - -if [ "$release" = "xenial" ] && [ -x /sbin/start ] && [ -x /sbin/stop ] && [ -x /sbin/restart ] && [ -x /sbin/status ] && [ -x /sbin/initctl ] && [ ! "$TRAVIS" ]; then - echo "You appear to be running Ubuntu Xenial, but with the upstart package installed." - echo "In Ubuntu Xenial, upstart has been replaced by systemd, and having upstart" - echo "installed will break the init scripts for Zulip dependencies like nginx." - echo "Please uninstall the \"upstart\" package (apt-get remove upstart) and rerun" - echo "this install script." - exit 1 -fi diff --git a/scripts/lib/install b/scripts/lib/install index 966bc0ab19..e8240b43e9 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -113,9 +113,7 @@ case "$os_id$os_version_id" in Unsupported OS release: $os_id $os_version_id Zulip in production is supported only on: - - Debian 9 "stretch" - Debian 10 "buster" - - Ubuntu 16.04 LTS "xenial" - Ubuntu 18.04 LTS "bionic" For more information, see: @@ -167,9 +165,6 @@ case " $os_id $os_id_like " in ;; esac -# Handle issues around upstart on Ubuntu Xenial -"$ZULIP_PATH"/scripts/lib/check-upstart - # Check early for missing SSL certificates if [ "$PUPPET_CLASSES" = "zulip::voyager" ] && [ -z "$USE_CERTBOT""$SELF_SIGNED_CERT" ] && { ! [ -e "/etc/ssl/private/zulip.key" ] || ! [ -e "/etc/ssl/certs/zulip.combined-chain.crt" ]; }; then set +x diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2 index 1d4e401804..5c9c1dbe99 100755 --- a/scripts/lib/upgrade-zulip-stage-2 +++ b/scripts/lib/upgrade-zulip-stage-2 @@ -58,9 +58,6 @@ try: except (configparser.NoSectionError, configparser.NoOptionError): tornado_processes = 1 -# Handle issues around upstart on Ubuntu Xenial -subprocess.check_call(["./scripts/lib/check-upstart"]) - if glob.glob("/usr/share/postgresql/*/extension/tsearch_extras.control"): # Remove legacy tsearch_extras package references subprocess.check_call([ diff --git a/tools/test-install/prepare-base b/tools/test-install/prepare-base index 6b6e9c5b38..48f03bc8e9 100755 --- a/tools/test-install/prepare-base +++ b/tools/test-install/prepare-base @@ -10,8 +10,6 @@ RELEASE="$1" ARCH=amd64 # TODO: maybe i686 too case "$RELEASE" in - xenial) extra_packages=(virtualenv postgresql-9.5) - ;; bionic) extra_packages=(virtualenv postgresql-10) ;; *)