|
Lines 1-19
Link Here
|
| 1 |
--- ejabberdctl.template.orig 2016-03-09 03:31:00 UTC |
1 |
--- ejabberdctl.template.orig |
| 2 |
+++ ejabberdctl.template |
2 |
+++ ejabberdctl.template |
| 3 |
@@ -16,6 +16,7 @@ IEX={{bindir}}/iex |
3 |
@@ -15,7 +15,8 @@ |
|
|
4 |
IEX={{bindir}}/iex |
| 4 |
EPMD={{bindir}}/epmd |
5 |
EPMD={{bindir}}/epmd |
| 5 |
INSTALLUSER={{installuser}} |
6 |
INSTALLUSER={{installuser}} |
| 6 |
ERL_LIBS={{libdir}} |
7 |
-ERL_LIBS={{libdir}} |
|
|
8 |
+ERL_LIBS={{libdir}}/ejabberd |
| 7 |
+ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib |
9 |
+ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib |
| 8 |
|
10 |
|
| 9 |
# check the proper system user is used if defined |
11 |
# check the proper system user is used if defined |
| 10 |
if [ "$INSTALLUSER" != "" ] ; then |
12 |
if [ "$INSTALLUSER" != "" ] ; then |
| 11 |
@@ -31,14 +32,14 @@ if [ "$INSTALLUSER" != "" ] ; then |
13 |
@@ -31,14 +32,14 @@ |
| 12 |
fi |
14 |
fi |
| 13 |
done |
15 |
done |
| 14 |
if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then |
16 |
if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then |
| 15 |
- EXEC_CMD="bash -c" |
17 |
- EXEC_CMD="bash -c" |
| 16 |
+ EXEC_CMD="/usr/local/bin/bash -c" |
18 |
+ EXEC_CMD="%%LOCALBASE%%/bin/bash -c" |
| 17 |
fi |
19 |
fi |
| 18 |
if [ "$EXEC_CMD" = "false" ] ; then |
20 |
if [ "$EXEC_CMD" = "false" ] ; then |
| 19 |
echo "This command can only be run by root or the user $INSTALLUSER" >&2 |
21 |
echo "This command can only be run by root or the user $INSTALLUSER" >&2 |
|
Lines 21-31
Link Here
|
| 21 |
fi |
23 |
fi |
| 22 |
else |
24 |
else |
| 23 |
- EXEC_CMD="bash -c" |
25 |
- EXEC_CMD="bash -c" |
| 24 |
+ EXEC_CMD="/usr/local/bin/bash -c" |
26 |
+ EXEC_CMD="%%LOCALBASE%%/bin/bash -c" |
| 25 |
fi |
27 |
fi |
| 26 |
|
28 |
|
| 27 |
# parse command line parameters |
29 |
# parse command line parameters |
| 28 |
@@ -73,10 +74,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th |
30 |
@@ -73,10 +74,10 @@ |
| 29 |
EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml |
31 |
EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml |
| 30 |
fi |
32 |
fi |
| 31 |
if [ "$LOGS_DIR" = "" ] ; then |
33 |
if [ "$LOGS_DIR" = "" ] ; then |
|
Lines 38-44
Link Here
|
| 38 |
fi |
40 |
fi |
| 39 |
if [ "$EJABBERD_DOC_PATH" = "" ] ; then |
41 |
if [ "$EJABBERD_DOC_PATH" = "" ] ; then |
| 40 |
EJABBERD_DOC_PATH={{docdir}} |
42 |
EJABBERD_DOC_PATH={{docdir}} |
| 41 |
@@ -354,7 +355,7 @@ ctl() |
43 |
@@ -354,7 +355,7 @@ |
| 42 |
# using flock if available. Expects a linux-style |
44 |
# using flock if available. Expects a linux-style |
| 43 |
# flock that can lock a file descriptor. |
45 |
# flock that can lock a file descriptor. |
| 44 |
MAXCONNID=100 |
46 |
MAXCONNID=100 |