[OpenSRF-GIT] OpenSRF branch rel_2_4 updated. osrf_rel_2_4_0-5-g03f6bc9
Evergreen Git
git at git.evergreen-ils.org
Mon May 4 17:14:12 EDT 2015
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, rel_2_4 has been updated
via 03f6bc90e6b22a55642adadf4433b7371d1c4c32 (commit)
via dcfa2ecbaf98fcad01a9d5a9a01c39d6d5a1790e (commit)
via 05797dcc1b4b4872cd3d66a1ec8735f4f3ae6611 (commit)
via e8cfee7c5d3639bb13962219453c74e626ce4981 (commit)
from ec2a163c1526dd0d473ed513210bcda35bb00179 (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 03f6bc90e6b22a55642adadf4433b7371d1c4c32
Author: Josh Stompro <github at stompro.org>
Date: Tue Apr 21 09:50:49 2015 -0500
LP#1445503 - Updated Ejabberd setup steps for Ejabberd 14.x for Debian Jessie
Signed-off-by: Josh Stompro <github at stompro.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/README b/README
index 4e1675f..d9f1885 100644
--- a/README
+++ b/README
@@ -173,7 +173,7 @@ Configure the ejabberd server
OpenSRF requires an XMPP (Jabber) server. For performance reasons, ejabberd is
the Jabber server of choice for the OpenSRF project. In most cases, you only
-have to make a few changes to the default `ejabberd.cfg` file to make ejabberd
+have to make a few changes to the default configuration file to make ejabberd
work for OpenSRF.
1. Stop ejabberd before making any changes to its configuration by issuing the
@@ -191,7 +191,10 @@ work for OpenSRF.
systemctl stop ejabberd.service
---------------------------------------------------------------------------
+
-2. Open `/etc/ejabberd/ejabberd.cfg` and make the following
+2. Edit the ejabberd config file.
++
+(Debian Wheezy / Ubuntu) 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:
@@ -206,6 +209,30 @@ changes:
d. Increase the `max_user_sessions` value to 10000
e. Comment out the `mod_offline` directive
+
+(Debian Jessie) Ejabberd 13.x and 14.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 `shaper:` `normal` and `fast` values to 500000
+ d. Increase the `max_user_sessions:` `all:` value to 10000
+ e. 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
commit dcfa2ecbaf98fcad01a9d5a9a01c39d6d5a1790e
Author: Ben Shum <bshum at biblio.org>
Date: Mon May 4 17:01:23 2015 -0400
Docs: Emphasize variables and paths consistently in README
Some variables and paths were not emphasized when the instructions for
websockets was added. Maintain consistency in the document and emphasize
them.
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/README b/README
index 9da4cfd..4e1675f 100644
--- a/README
+++ b/README
@@ -365,7 +365,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)
+ `/usr/share/doc/apache2/README.multiple-instances`)
+
.(Debian / Ubuntu Precise)
[source, bash]
@@ -400,7 +400,7 @@ cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
cp examples/apache_24/websockets/apache2.conf /etc/apache2-websockets/
---------------------------------------------------------------------------
+
-6. OPTIONAL: add these configuration variables to /etc/apache2-websockets/envvars
+6. OPTIONAL: add these configuration variables to `/etc/apache2-websockets/envvars`
and adjust as needed.
+
[source, bash]
@@ -412,18 +412,18 @@ export OSRF_WEBSOCKET_CONFIG_CTXT=gateway
export OSRF_WEBSOCKET_MAX_REQUEST_WAIT_TIME=600
---------------------------------------------------------------------------
+
- * IDLE_TIMEOUT specifies how long we will allow a client to stay connected
+ * `IDLE_TIMEOUT` specifies how long we will allow a client to stay connected
while idle. A longer timeout means less network traffic (from fewer
websocket CONNECT calls), but it also means more Apache processes are
tied up doing nothing.
- * IDLE_CHECK_INTERVAL specifies how often we wake to check the idle status
+ * `IDLE_CHECK_INTERVAL` specifies how often we wake to check the idle status
of the connected client.
- * MAX_REQUEST_WAIT_TIME is the maximum amount of time the gateway will
+ * `MAX_REQUEST_WAIT_TIME` is the maximum amount of time the gateway will
wait before declaring a client as idle when there is a long-running
outstanding request, yet no other activity is occurring. This is
primarily a fail-safe to allow idle timeouts when one or more requests
died on the server, and thus no response was ever delivered to the gateway.
- * CONFIG_FILE / CTXT are the standard opensrf core config options.
+ * `CONFIG_FILE / CTXT` are the standard opensrf core config options.
7. Before you can start websockets, you must install a valid SSL certificate
in `/etc/apache2/ssl/`. It is possible, but not recommended, to generate a
commit 05797dcc1b4b4872cd3d66a1ec8735f4f3ae6611
Author: Ben Shum <bshum at biblio.org>
Date: Mon May 4 16:57:38 2015 -0400
Docs: Add [source, bash] to code blocks that were not defined in README
For consistency, add [source, bash] to all the blocks of code or script
commands in the README
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/README b/README
index 7154e7c..9da4cfd 100644
--- a/README
+++ b/README
@@ -32,6 +32,7 @@ Issue the following commands as the *root* Linux account to install
prerequisites using the Makefile.install prerequisite installer, substituting
your operating system identifier for <osname> below:
+[source, bash]
---------------------------------------------------------------------------
apt-get install make
make -f src/extras/Makefile.install <osname>
@@ -89,6 +90,7 @@ build OpenSRF. The default installation prefix (PREFIX) for OpenSRF is
If you are building OpenSRF for Evergreen, issue the following commands as
the *user* Linux account to configure and build OpenSRF:
+[source, bash]
---------------------------------------------------------------------------
./configure --prefix=/openils --sysconfdir=/openils/conf
make
@@ -140,6 +142,7 @@ file. Here are entries that you could add to a stock `/etc/hosts` file for our
example domains:
.Example added entries for `/etc/hosts`
+[source, bash]
---------------------------------------------------------------------------
127.0.1.2 public.localhost public
127.0.1.3 private.localhost private
@@ -193,6 +196,7 @@ changes:
a. Define your public and private domains in the `hosts` directive. For
example:
+
+[source, bash]
---------------------------------------------------------------------------
{hosts, ["localhost", "private.localhost", "public.localhost"]}.
---------------------------------------------------------------------------
@@ -329,6 +333,7 @@ srfsh
+
2. Issue the following request to test the `opensrf.math` service:
+
+[source, bash]
---------------------------------------------------------------------------
srfsh# request opensrf.math add 2,2
---------------------------------------------------------------------------
@@ -398,6 +403,7 @@ cp examples/apache_24/websockets/apache2.conf /etc/apache2-websockets/
6. OPTIONAL: add these configuration variables to /etc/apache2-websockets/envvars
and adjust as needed.
+
+[source, bash]
---------------------------------------------------------------------------
export OSRF_WEBSOCKET_IDLE_TIMEOUT=120
export OSRF_WEBSOCKET_IDLE_CHECK_INTERVAL=5
commit e8cfee7c5d3639bb13962219453c74e626ce4981
Author: Ben Shum <bshum at biblio.org>
Date: Mon May 4 16:49:08 2015 -0400
Docs: Keep all source syntax consistent in README
Change occurrences of [source,bash] to [source, bash] for consistency
throughout README.
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/README b/README
index 38aff45..7154e7c 100644
--- a/README
+++ b/README
@@ -270,7 +270,7 @@ Updating the OpenSRF configuration files
to create your locally customizable OpenSRF configuration files:
+
.Copying the example OpenSRF configuration files
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
cd SYSCONFDIR
cp opensrf_core.xml.example opensrf_core.xml
@@ -306,7 +306,7 @@ osrf_control --localhost --start-all
To stop all OpenSRF services with a hostname of `localhost`, issue the
following command as the *opensrf* Linux account:
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
osrf_control --localhost --stop-all
---------------------------------------------------------------------------
@@ -322,7 +322,7 @@ services, test the services as follows:
command as the *opensrf* Linux account:
+
.Starting the `srfsh` interactive OpenSRF shell
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
srfsh
---------------------------------------------------------------------------
@@ -343,14 +343,14 @@ account:
1. Install git if not already present:
+
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
apt-get install git-core
---------------------------------------------------------------------------
+
2. Install the apache-websocket module:
+
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
# Use a temporary directory
cd /tmp
@@ -363,20 +363,20 @@ apxs2 -i -a -c mod_websocket.c
/usr/share/doc/apache2/README.multiple-instances)
+
.(Debian / Ubuntu Precise)
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
sh /usr/share/doc/apache2.2-common/examples/setup-instance websockets
---------------------------------------------------------------------------
+
.(Ubuntu Trusty)
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
sh /usr/share/doc/apache2/examples/setup-instance websockets
---------------------------------------------------------------------------
+
4. Remove from the main apache instance
+
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
a2dismod websocket
---------------------------------------------------------------------------
@@ -384,13 +384,13 @@ a2dismod websocket
5. Copy into place the config files
+
.(Debian / Ubuntu Precise)
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
---------------------------------------------------------------------------
+
.(Ubuntu Trusty)
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
cp examples/apache_24/websockets/apache2.conf /etc/apache2-websockets/
---------------------------------------------------------------------------
@@ -429,7 +429,7 @@ export OSRF_WEBSOCKET_MAX_REQUEST_WAIT_TIME=600
fire up the secondary Apache instance. Errors will appear in
`/var/log/apache2-websockets/error.log`. Start apache2-websockets with:
+
-[source,bash]
+[source, bash]
---------------------------------------------------------------------------
/etc/init.d/apache2-websockets start
---------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
README | 71 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 19 deletions(-)
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list