diff options
| author | Badlop <badlop@process-one.net> | 2010-06-24 12:12:13 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-06-28 13:17:55 +0200 |
| commit | 153154133112ad91cf94890c0f9bb2161d7af380 (patch) | |
| tree | fd28e8daf076cefc0b9fb43c05e801189b510e6d /src/ejabberdctl.template | |
| parent | Inform client that SSL session caching is disabled (thanks to Pawel Chmielowski) (diff) | |
Fix problem when FIREWALL_WINDOW options for erl kernel were used
http://www.ejabberd.im/node/4120
Diffstat (limited to 'src/ejabberdctl.template')
| -rw-r--r-- | src/ejabberdctl.template | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template index 9ede77df..6e4588b5 100644 --- a/src/ejabberdctl.template +++ b/src/ejabberdctl.template @@ -82,7 +82,7 @@ else KERNEL_OPTS="-kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}" 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 if [ "$EJABBERDDIR" = "" ]; then @@ -141,6 +141,7 @@ start () -noinput -detached \ -pa $EJABBERD_EBIN_PATH \ -mnesia dir \"\\\"$SPOOLDIR\\\"\" \ + $KERNEL_OPTS \ -s ejabberd \ -sasl sasl_error_logger \\{file,\\\"$SASL_LOG_PATH\\\"\\} \ $ERLANG_OPTS $ARGS \"$@\"" @@ -174,6 +175,7 @@ debug () $NAME debug-${TTY}-${ERLANG_NODE} \ -remsh $ERLANG_NODE \ -hidden \ + $KERNEL_OPTS \ $ERLANG_OPTS $ARGS \"$@\"" } @@ -203,6 +205,7 @@ live () $NAME $ERLANG_NODE \ -pa $EJABBERD_EBIN_PATH \ -mnesia dir \"\\\"$SPOOLDIR\\\"\" \ + $KERNEL_OPTS \ -s ejabberd \ $ERLANG_OPTS $ARGS \"$@\"" } @@ -310,6 +313,7 @@ ctlexec () -noinput \ -hidden \ -pa $EJABBERD_EBIN_PATH \ + $KERNEL_OPTS \ -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND" } |