Fix problem when FIREWALL_WINDOW options for erl kernel were used
http://www.ejabberd.im/node/4120
This commit is contained in:
parent
b7e02cc42e
commit
1531541331
|
@ -82,7 +82,7 @@ else
|
||||||
KERNEL_OPTS="-kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
|
KERNEL_OPTS="-kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS $KERNEL_OPTS"
|
ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
|
||||||
|
|
||||||
# define additional environment variables
|
# define additional environment variables
|
||||||
if [ "$EJABBERDDIR" = "" ]; then
|
if [ "$EJABBERDDIR" = "" ]; then
|
||||||
|
@ -141,6 +141,7 @@ start ()
|
||||||
-noinput -detached \
|
-noinput -detached \
|
||||||
-pa $EJABBERD_EBIN_PATH \
|
-pa $EJABBERD_EBIN_PATH \
|
||||||
-mnesia dir \"\\\"$SPOOLDIR\\\"\" \
|
-mnesia dir \"\\\"$SPOOLDIR\\\"\" \
|
||||||
|
$KERNEL_OPTS \
|
||||||
-s ejabberd \
|
-s ejabberd \
|
||||||
-sasl sasl_error_logger \\{file,\\\"$SASL_LOG_PATH\\\"\\} \
|
-sasl sasl_error_logger \\{file,\\\"$SASL_LOG_PATH\\\"\\} \
|
||||||
$ERLANG_OPTS $ARGS \"$@\""
|
$ERLANG_OPTS $ARGS \"$@\""
|
||||||
|
@ -174,6 +175,7 @@ debug ()
|
||||||
$NAME debug-${TTY}-${ERLANG_NODE} \
|
$NAME debug-${TTY}-${ERLANG_NODE} \
|
||||||
-remsh $ERLANG_NODE \
|
-remsh $ERLANG_NODE \
|
||||||
-hidden \
|
-hidden \
|
||||||
|
$KERNEL_OPTS \
|
||||||
$ERLANG_OPTS $ARGS \"$@\""
|
$ERLANG_OPTS $ARGS \"$@\""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,6 +205,7 @@ live ()
|
||||||
$NAME $ERLANG_NODE \
|
$NAME $ERLANG_NODE \
|
||||||
-pa $EJABBERD_EBIN_PATH \
|
-pa $EJABBERD_EBIN_PATH \
|
||||||
-mnesia dir \"\\\"$SPOOLDIR\\\"\" \
|
-mnesia dir \"\\\"$SPOOLDIR\\\"\" \
|
||||||
|
$KERNEL_OPTS \
|
||||||
-s ejabberd \
|
-s ejabberd \
|
||||||
$ERLANG_OPTS $ARGS \"$@\""
|
$ERLANG_OPTS $ARGS \"$@\""
|
||||||
}
|
}
|
||||||
|
@ -310,6 +313,7 @@ ctlexec ()
|
||||||
-noinput \
|
-noinput \
|
||||||
-hidden \
|
-hidden \
|
||||||
-pa $EJABBERD_EBIN_PATH \
|
-pa $EJABBERD_EBIN_PATH \
|
||||||
|
$KERNEL_OPTS \
|
||||||
-s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
|
-s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue