[OpenSRF-GIT] OpenSRF branch master updated. e7fe347408b52295f2f820f9527ccf00952b71e8
Evergreen Git
git at git.evergreen-ils.org
Wed May 4 13:32:48 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 e7fe347408b52295f2f820f9527ccf00952b71e8 (commit)
via 032a964795df73053d09dca37e62e3e276ce343e (commit)
via 1fca796c47c9e9c06e65b91085c13ad2cbe52954 (commit)
via e91074cf23eeca5da7e9c00977448dcc19b779cc (commit)
via 46dfeaf7245f81c1a8c9833b8cac87a997b23433 (commit)
via 334b6644ac319403f2095cff6f3cef992a9148ae (commit)
via c59b54a7c4f1d1561d23393f6122669d50f41166 (commit)
from c9174e7372b0c14091035617f0689f3719f7506b (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 e7fe347408b52295f2f820f9527ccf00952b71e8
Author: Jason Stephenson <jason at sigio.com>
Date: Wed May 4 13:05:31 2016 -0400
LP#1551090: Update README for Ubuntu 16.04 (Xenial Xerus).
Add installation steps for Ubuntu 16.04.
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 9fe63a0..178e6c8 100644
--- a/README
+++ b/README
@@ -44,6 +44,7 @@ Well-tested values for <osname> include:
* `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
Patches and suggestions for improvement from users of these distributions,
@@ -178,13 +179,13 @@ 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) Stopping ejabberd
+.(Debian / Ubuntu 14.04) Stopping ejabberd
[source, bash]
---------------------------------------------------------------------------
/etc/init.d/ejabberd stop
---------------------------------------------------------------------------
+
-.(Fedora) Stopping ejabberd
+.(Fedora / Ubuntu 16.04) Stopping ejabberd
[source, bash]
---------------------------------------------------------------------------
systemctl stop ejabberd.service
@@ -192,7 +193,7 @@ systemctl stop ejabberd.service
+
2. Edit the ejabberd config file.
+
-(Debian Wheezy / Ubuntu) Ejabberd 2.x.x::
+(Debian Wheezy / Ubuntu 14.04) 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
@@ -232,15 +233,40 @@ hosts:
##access_max_user_messages: max_user_offline_messages
-----------------------
+
+(Ubuntu 16.04) 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
+ example:
++
+[source, bash]
+---------------------------------------------------------------------------
+hosts:
+ - "localhost"
+ - "private.localhost"
+ - "public.localhost"
+---------------------------------------------------------------------------
++
+ b. Change all `max_stanza_size` values to 2000000
+ c. Change `auth_password_format` to plain
+ d. Change `shaper:` `normal` and `fast` values to 500000
+ e. Increase the `max_user_sessions:` `all:` value to 10000
+ f. Comment out the `mod_offline` directive
++
+-----------------------
+##mod_offline:
+ ##access_max_user_messages: max_user_offline_messages
+-----------------------
++
3. Restart the ejabberd server to make the changes take effect:
+
-.(Debian / Ubuntu) Starting ejabberd
+.(Debian / Ubuntu 14.04) Starting ejabberd
[source, bash]
---------------------------------------------------------------------------
/etc/init.d/ejabberd start
---------------------------------------------------------------------------
+
-.(Fedora) Starting ejabberd
+.(Fedora / Ubuntu 16.04) Starting ejabberd
[source, bash]
---------------------------------------------------------------------------
systemctl start ejabberd.service
commit 032a964795df73053d09dca37e62e3e276ce343e
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Apr 19 16:56:15 2016 -0400
LP#1551090: Enable mod_perl2 on Ubuntu 16.04 (Xenial Xerus).
Ubuntu Xenial Xerus does not automatically enable mod_perl2 for
Apache2 when the package is installed, so we enable it via the
Makefile.install.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 68cd043..666f320 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -194,7 +194,7 @@ 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
+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
@@ -243,6 +243,10 @@ apache_mpm_prefork_mods:
a2dismod mpm_event
a2enmod mpm_prefork
+# Need to activate mod_perl on some O/S.
+apache_perl_mod:
+ a2enmod perl
+
# Fedora
install_fedora_rpms:
yum -y install $(FEDORAS)
commit 1fca796c47c9e9c06e65b91085c13ad2cbe52954
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu Feb 18 20:12:40 2016 -0500
LP#1551090: Adding apache2-dev dependency to xenial and fixing whitespace
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
Conflicts:
src/extras/Makefile.install
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 33d0883..68cd043 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -52,8 +52,8 @@ DEBS = \
libgcrypt11-dev \
libgdbm-dev \
liblog-log4perl-perl\
- libmemcached-dev \
- libmemcached-tools \
+ libmemcached-dev \
+ libmemcached-tools \
libmodule-build-perl\
libnet-dns-perl\
libperl-dev\
@@ -154,8 +154,8 @@ EXTRA_DEBS = \
libnet-server-perl
EXTRA_DEBS_WHEEZY = \
- apache2-mpm-prefork \
- apache2-prefork-dev \
+ apache2-mpm-prefork \
+ apache2-prefork-dev \
libncurses5-dev
EXTRA_DEBS_JESSIE = \
@@ -175,6 +175,7 @@ EXTRA_DEBS_UBUNTU_TRUSTY = \
EXTRA_DEBS_UBUNTU_XENIAL = \
apache2 \
+ apache2-dev \
libncurses5-dev
# ----------------------------------------------------------------------------
commit e91074cf23eeca5da7e9c00977448dcc19b779cc
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Thu Feb 18 18:10:34 2016 -0500
LP#1551090: Since we move apache to the "install_extra_debs*" targets,
we need to move debian_sys_config further down to compensate.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 79d4ccc..33d0883 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -194,10 +194,10 @@ 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
-precise: install_extra_debs install_extra_debs_precise
-trusty: install_extra_debs install_extra_debs_trusty
-xenial: install_extra_debs install_extra_debs_xenial
-generic_ubuntu: install_debs debian_sys_config
+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
# ------------------------------------------------------------------
# - DEBIAN ---------------------------------------------------------
commit 46dfeaf7245f81c1a8c9833b8cac87a997b23433
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Feb 17 19:35:02 2016 -0500
LP#1551090: Adding necessary connectivity for xenial deb installation.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index edf2641..79d4ccc 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -196,7 +196,7 @@ ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods
precise: install_extra_debs install_extra_debs_precise
trusty: install_extra_debs install_extra_debs_trusty
-xenial: install_extra_debs
+xenial: install_extra_debs install_extra_debs_xenial
generic_ubuntu: install_debs debian_sys_config
# ------------------------------------------------------------------
@@ -233,6 +233,9 @@ install_extra_debs_precise:
install_extra_debs_trusty:
$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY)
+install_extra_debs_xenial:
+ $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_XENIAL)
+
# Some OSes activate the Apache mpm_event module by default.
# OpenSRF requires prefork.
apache_mpm_prefork_mods:
commit 334b6644ac319403f2095cff6f3cef992a9148ae
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Feb 17 19:26:01 2016 -0500
LP#1551090: Adding apache2 package to Makefile.install deb list.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index a2fc7b8..edf2641 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -174,6 +174,7 @@ EXTRA_DEBS_UBUNTU_TRUSTY = \
ncurses-dev
EXTRA_DEBS_UBUNTU_XENIAL = \
+ apache2 \
libncurses5-dev
# ----------------------------------------------------------------------------
commit c59b54a7c4f1d1561d23393f6122669d50f41166
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Feb 17 15:28:05 2016 -0500
LP#1551090: Updating Makefile to accommodate ubuntu-xenial target.
Removing some redundancy in the extra debs lists.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
Conflicts:
src/extras/Makefile.install
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 604306b..a2fc7b8 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -32,8 +32,6 @@ APT_TOOL=apt-get -yq
# Debian dependencies
DEBS = \
- apache2-mpm-prefork\
- apache2-prefork-dev\
autoconf\
automake\
build-essential\
@@ -54,6 +52,8 @@ DEBS = \
libgcrypt11-dev \
libgdbm-dev \
liblog-log4perl-perl\
+ libmemcached-dev \
+ libmemcached-tools \
libmodule-build-perl\
libnet-dns-perl\
libperl-dev\
@@ -100,6 +100,8 @@ FEDORAS = \
libmemcached \
libmemcached-devel \
libtool \
+ libxml-libxml-perl \
+ libxml-libxslt-perl \
libxml2-devel \
libxml2-python \
libxslt-devel \
@@ -152,31 +154,28 @@ EXTRA_DEBS = \
libnet-server-perl
EXTRA_DEBS_WHEEZY = \
- libmemcached-dev \
- libmemcached-tools \
- libxml-libxml-perl \
- libxml-libxslt-perl \
+ apache2-mpm-prefork \
+ apache2-prefork-dev \
libncurses5-dev
EXTRA_DEBS_JESSIE = \
- libmemcached-dev \
- libmemcached-tools \
- libxml-libxml-perl \
- libxml-libxslt-perl \
+ apache2-mpm-prefork \
+ apache2-prefork-dev \
libncurses5-dev
EXTRA_DEBS_UBUNTU_PRECISE = \
- libmemcached-dev\
- libxml-libxml-perl \
- libxml-libxslt-perl \
+ apache2-mpm-prefork \
+ apache2-prefork-dev \
ncurses-dev
EXTRA_DEBS_UBUNTU_TRUSTY = \
- libmemcached-dev\
- libxml-libxml-perl \
- libxml-libxslt-perl \
+ apache2-mpm-prefork \
+ apache2-prefork-dev \
ncurses-dev
+EXTRA_DEBS_UBUNTU_XENIAL = \
+ libncurses5-dev
+
# ----------------------------------------------------------------------------
all:
@@ -193,8 +192,10 @@ 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
precise: install_extra_debs install_extra_debs_precise
trusty: install_extra_debs install_extra_debs_trusty
+xenial: install_extra_debs
generic_ubuntu: install_debs debian_sys_config
# ------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
README | 36 +++++++++++++++++++++++++++----
src/extras/Makefile.install | 48 ++++++++++++++++++++++++++-----------------
2 files changed, 60 insertions(+), 24 deletions(-)
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list