[OpenSRF-GIT] OpenSRF branch master updated. 784233808062dbc599b649ce9858759ab0a8dff3
Evergreen Git
git at git.evergreen-ils.org
Mon Oct 31 17:28:39 EDT 2016
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 784233808062dbc599b649ce9858759ab0a8dff3 (commit)
via 15f8c538af5469545fabab9e21252f49555ae131 (commit)
via e3f9b6a3adb8391e83221909575554ab1ec8c74c (commit)
from 34038f2e3dd9a2ad6842f3593938955143213b11 (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 784233808062dbc599b649ce9858759ab0a8dff3
Author: Ben Shum <ben at evergreener.net>
Date: Tue Jul 5 12:53:13 2016 -0400
LP#1603708: Remove support for Ubuntu 12.04 Precise
With support for Ubuntu 16.04 Xenial in place, remove the oldest LTS, which is
Ubuntu 12.04 Precise.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/README b/README
index 69cd54b..bb1228d 100644
--- a/README
+++ b/README
@@ -42,7 +42,6 @@ Well-tested values for <osname> include:
* `debian-jessie` for Debian 8.0
* `debian-wheezy` for Debian 7.0
- * `ubuntu-precise` for Ubuntu 12.04
* `ubuntu-trusty` for Ubuntu 14.04
* `ubuntu-xenial` for Ubuntu 16.04
* `fedora` for Fedora 17 and later
@@ -419,7 +418,7 @@ apxs2 -i -a -c mod_websocket.c
3. Create the websocket Apache instance (more information about this in
`/usr/share/doc/apache2/README.multiple-instances`)
+
-.(Debian / Ubuntu Precise)
+.(Debian)
[source, bash]
---------------------------------------------------------------------------
sh /usr/share/doc/apache2.2-common/examples/setup-instance websockets
@@ -440,7 +439,7 @@ a2dismod websocket
+
5. Copy into place the config files
+
-.(Debian / Ubuntu Precise)
+.(Debian)
[source, bash]
---------------------------------------------------------------------------
cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 96e60d8..39d7ed4 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -4,7 +4,7 @@
#
# Makefile to install prerequisites for OpenSRF
#
-# Currently supports Debian (jessie/wheezy), Ubuntu (precise/trusty)
+# Currently supports Debian (jessie/wheezy), Ubuntu (trusty/xenial)
# and Fedora (16).
#
# Installs Perl prereqs, libjs with Perl wrapper
@@ -14,10 +14,10 @@
# - or -
# make -f Makefile.install debian-wheezy
# - or -
-# make -f Makefile.install ubuntu-precise
-# - or -
# make -f Makefile.install ubuntu-trusty
# - or -
+# make -f Makefile.install ubuntu-xenial
+# - or -
# make -f Makefile.install fedora
#
# ---------------------------------------------------------------------
@@ -163,11 +163,6 @@ EXTRA_DEBS_JESSIE = \
apache2-prefork-dev \
libncurses5-dev
-EXTRA_DEBS_UBUNTU_PRECISE = \
- apache2-mpm-prefork \
- apache2-prefork-dev \
- ncurses-dev
-
EXTRA_DEBS_UBUNTU_TRUSTY = \
apache2-mpm-prefork \
apache2-prefork-dev \
@@ -192,10 +187,8 @@ generic_debian: install_debs
fedora: install_fedora_rpms
-ubuntu-precise: generic_ubuntu precise
ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod
-precise: install_extra_debs install_extra_debs_precise debian_sys_config
trusty: install_extra_debs install_extra_debs_trusty debian_sys_config
xenial: install_extra_debs install_extra_debs_xenial debian_sys_config
generic_ubuntu: install_debs
@@ -228,9 +221,6 @@ install_extra_debs_wheezy: install_extra_debs
$(APT_TOOL) install $(EXTRA_DEBS_WHEEZY)
# Install even more packaged dependencies on modern distros
-install_extra_debs_precise:
- $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_PRECISE)
-
install_extra_debs_trusty:
$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY)
commit 15f8c538af5469545fabab9e21252f49555ae131
Author: Ben Shum <ben at evergreener.net>
Date: Tue Jul 5 12:50:34 2016 -0400
Docs: Change 14.04 to Trusty in README
For consistency, change references from numbered "Ubuntu 14.04" to "Ubuntu Trusty"
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/README b/README
index 91354d5..69cd54b 100644
--- a/README
+++ b/README
@@ -179,7 +179,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 14.04) Stopping ejabberd
+.(Debian / Ubuntu Trusty) Stopping ejabberd
[source, bash]
---------------------------------------------------------------------------
/etc/init.d/ejabberd stop
@@ -193,7 +193,7 @@ systemctl stop ejabberd.service
+
2. Edit the ejabberd config file.
+
-(Debian Wheezy / Ubuntu 14.04) Ejabberd 2.x.x::
+(Debian Wheezy / 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
@@ -260,7 +260,7 @@ hosts:
+
3. Restart the ejabberd server to make the changes take effect:
+
-.(Debian / Ubuntu 14.04) Starting ejabberd
+.(Debian / Ubuntu Trusty) Starting ejabberd
[source, bash]
---------------------------------------------------------------------------
/etc/init.d/ejabberd start
commit e3f9b6a3adb8391e83221909575554ab1ec8c74c
Author: Ben Shum <ben at evergreener.net>
Date: Tue Jul 5 12:44:17 2016 -0400
Docs: Add Xenial references in the websocket setup instructions
We were missing Xenial references for the websocket setup instructions.
They are the same as Trusty, so group together for now.
Also, change references to "Ubuntu 16.04" to read "Ubuntu Xenial" too.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/README b/README
index 178e6c8..91354d5 100644
--- a/README
+++ b/README
@@ -185,7 +185,7 @@ work for OpenSRF.
/etc/init.d/ejabberd stop
---------------------------------------------------------------------------
+
-.(Fedora / Ubuntu 16.04) Stopping ejabberd
+.(Fedora / Ubuntu Xenial) Stopping ejabberd
[source, bash]
---------------------------------------------------------------------------
systemctl stop ejabberd.service
@@ -233,7 +233,7 @@ hosts:
##access_max_user_messages: max_user_offline_messages
-----------------------
+
-(Ubuntu 16.04) Ejabberd 16.x::
+(Ubuntu Xenial) 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
@@ -266,7 +266,7 @@ hosts:
/etc/init.d/ejabberd start
---------------------------------------------------------------------------
+
-.(Fedora / Ubuntu 16.04) Starting ejabberd
+.(Fedora / Ubuntu Xenial) Starting ejabberd
[source, bash]
---------------------------------------------------------------------------
systemctl start ejabberd.service
@@ -425,7 +425,7 @@ apxs2 -i -a -c mod_websocket.c
sh /usr/share/doc/apache2.2-common/examples/setup-instance websockets
---------------------------------------------------------------------------
+
-.(Ubuntu Trusty)
+.(Ubuntu Trusty / Xenial)
[source, bash]
---------------------------------------------------------------------------
sh /usr/share/doc/apache2/examples/setup-instance websockets
@@ -446,7 +446,7 @@ a2dismod websocket
cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
---------------------------------------------------------------------------
+
-.(Ubuntu Trusty)
+.(Ubuntu Trusty / Xenial)
[source, bash]
---------------------------------------------------------------------------
cp examples/apache_24/websockets/apache2.conf /etc/apache2-websockets/
-----------------------------------------------------------------------
Summary of changes:
README | 21 ++++++++++-----------
src/extras/Makefile.install | 16 +++-------------
2 files changed, 13 insertions(+), 24 deletions(-)
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list