[OpenSRF-GIT] OpenSRF branch master updated. e7b2ff8dac56c069fec4e718a0699ae1bc98d44d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  e7b2ff8dac56c069fec4e718a0699ae1bc98d44d (commit)
      from  d7e9df6838f1c9a72db3fd41556d178cfe7f6700 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7b2ff8dac56c069fec4e718a0699ae1bc98d44d
Author: Jason Stephenson <jason at sigio.com>
Date:   Fri Dec 14 15:35:49 2018 -0500

    Lp 1808580: Remove Installation Support for Ubuntu 14.04
    
    Remove references to Ubuntu 14.04 from the README and the
    Makefile.install prerequisites.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/README b/README
index 2b74eed..f2ae00b 100644
--- a/README
+++ b/README
@@ -66,7 +66,6 @@ Well-tested values for <osname> include:
 
   * `debian-stretch` for Debian 9
   * `debian-jessie` for Debian 8
-  * `ubuntu-trusty` for Ubuntu 14.04
   * `ubuntu-xenial` for Ubuntu 16.04
   * `ubuntu-bionic` for Ubuntu 18.04
 
@@ -207,12 +206,6 @@ work for OpenSRF.
 1. Stop ejabberd before making any changes to its configuration by issuing the
    following command as the *root* Linux account:
 +
-.(Ubuntu Trusty) Stopping ejabberd
-[source, bash]
----------------------------------------------------------------------------
-/etc/init.d/ejabberd stop
----------------------------------------------------------------------------
-+
 .(Debian / Ubuntu Xenial / Ubuntu Bionic) Stopping ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
@@ -221,21 +214,6 @@ systemctl stop ejabberd.service
 +
 2. Edit the ejabberd config file.
 +
-(Ubuntu Trusty) Ejabberd 2.x.x::
-Open `/etc/ejabberd/ejabberd.cfg` and make the following
-changes:
-  a. Define your public and private domains in the `hosts` directive. For
-   example:
-+
-[source, bash]
----------------------------------------------------------------------------
-{hosts, ["localhost", "private.localhost", "public.localhost"]}.
----------------------------------------------------------------------------
-+
-  b. Change all `maxrate` values to 500000
-  c. Increase the `max_user_sessions` value to 10000
-  d. Comment out the `mod_offline` directive
-+
 (Debian Jessie) Ejabberd 13.x and 14.x::
 Open `/etc/ejabberd/ejabberd.yml` and make the following
 changes:
@@ -311,12 +289,6 @@ hosts:
   g. Uncomment the `mod_legacy_auth` directive
 3. Restart the ejabberd server to make the changes take effect:
 +
-.(Ubuntu Trusty) Starting ejabberd
-[source, bash]
----------------------------------------------------------------------------
-/etc/init.d/ejabberd start
----------------------------------------------------------------------------
-+
 .(Debian / Ubuntu Xenial / Ubuntu Bionic) Starting ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index de87978..4ffae87 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -4,8 +4,8 @@
 #
 # Makefile to install prerequisites for OpenSRF
 #
-# Currently supports Debian (jessie/stretch), Ubuntu (trusty/xenial)
-# and Fedora (16).
+# Currently supports Debian (jessie/stretch) and Ubuntu
+# (xenial/bionic)
 #
 # Installs Perl prereqs, libjs with Perl wrapper
 #
@@ -14,8 +14,6 @@
 # 	- or -
 # 	make -f Makefile.install debian-jessie
 # 	- or -
-# 	make -f Makefile.install ubuntu-trusty
-# 	- or -
 # 	make -f Makefile.install ubuntu-xenial
 #   - or -
 #   make -f Makefile.install ubuntu-bionic
@@ -167,11 +165,6 @@ EXTRA_DEBS_DEBIAN_STRETCH = \
 	apache2-dev \
 	libncurses5-dev
 
-EXTRA_DEBS_UBUNTU_TRUSTY = \
-	apache2-mpm-prefork \
-	apache2-prefork-dev \
-	ncurses-dev
-
 EXTRA_DEBS_UBUNTU_XENIAL = \
 	apache2 \
 	apache2-dev \
@@ -196,10 +189,8 @@ generic_debian: install_debs
 
 fedora: install_fedora_rpms
 
-ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
 ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod
 ubuntu-bionic: generic_ubuntu bionic apache_mpm_prefork_mods apache_perl_mod
-trusty: install_extra_debs install_extra_debs_trusty debian_sys_config
 xenial: install_extra_debs install_extra_debs_xenial debian_sys_config
 bionic: install_extra_debs install_extra_debs_bionic debian_sys_config
 generic_ubuntu: install_debs
@@ -226,9 +217,6 @@ install_extra_debs_jessie: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_JESSIE)
 
 # Install even more packaged dependencies on modern distros
-install_extra_debs_trusty:
-	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY)
-
 install_extra_debs_xenial:
 	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_XENIAL)
 

-----------------------------------------------------------------------

Summary of changes:
 README                      | 28 ----------------------------
 src/extras/Makefile.install | 16 ++--------------
 2 files changed, 2 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
OpenSRF