From 4270ec3b6e4d9eb1b88e3c4ff718c1ccd858526c Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Wed, 28 Oct 2020 11:32:45 -0400 Subject: [PATCH] Lp 1901899: Remove References to Ubuntu 16.04 Remove references to Ubuntu 16.04 Xenial Xerus in the README and Makefile.install. Signed-off-by: Jason Stephenson Signed-off-by: Ben Shum --- README | 7 +++---- src/extras/Makefile.install | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README b/README index 0d8b820..ffd6aef 100644 --- a/README +++ b/README @@ -67,7 +67,6 @@ Well-tested values for include: * `debian-buster` for Debian 10 * `debian-stretch` for Debian 9 * `debian-jessie` for Debian 8 - * `ubuntu-xenial` for Ubuntu 16.04 * `ubuntu-bionic` for Ubuntu 18.04 * `ubuntu-focal` for Ubuntu 20.04 @@ -206,7 +205,7 @@ work for OpenSRF. 1. Stop ejabberd before making any changes to its configuration by issuing the following command as the *root* Linux account: + -.(Debian / Ubuntu Xenial / Ubuntu Bionic / Ubuntu Focal) Stopping ejabberd +.(Debian / Ubuntu Bionic / Ubuntu Focal) Stopping ejabberd [source, bash] --------------------------------------------------------------------------- systemctl stop ejabberd.service @@ -237,7 +236,7 @@ hosts: ##access_max_user_messages: max_user_offline_messages ----------------------- + -(Debian Stretch / Ubuntu Xenial) Ejabberd 16.x:: +(Debian Stretch) Ejabberd 16.x:: Open `/etc/ejabberd/ejabberd.yml` and make the following changes: a. Define your public and private domains in the `hosts` directive. For @@ -294,7 +293,7 @@ mod_legacy_auth: {} + 3. Restart the ejabberd server to make the changes take effect: + -.(Debian / Ubuntu Xenial / Ubuntu Bionic / Ubuntu Focal) Starting ejabberd +.(Debian / Ubuntu Bionic / Ubuntu Focal) Starting ejabberd [source, bash] --------------------------------------------------------------------------- systemctl start ejabberd.service diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install index 0808d21..808042b 100644 --- a/src/extras/Makefile.install +++ b/src/extras/Makefile.install @@ -5,7 +5,7 @@ # Makefile to install prerequisites for OpenSRF # # Currently supports Debian (jessie/stretch) and Ubuntu -# (xenial/bionic/focal) +# (bionic/focal) # # Installs Perl prereqs, libjs with Perl wrapper # @@ -16,8 +16,6 @@ # - or - # make -f Makefile.install debian-jessie # - or - -# make -f Makefile.install ubuntu-xenial -# - or - # make -f Makefile.install ubuntu-bionic # - or - # make -f Makefile.install ubuntu-focal @@ -181,7 +179,6 @@ generic_debian: install_debs fedora: install_fedora_rpms -ubuntu-xenial: generic_ubuntu ubuntu-bionic: generic_ubuntu ubuntu-focal: generic_ubuntu generic_ubuntu: install_debs install_extra_debs install_extra_debs_ubuntu \ -- 2.43.2