← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ejabberd/utopic

« back to all changes in this revision

Viewing changes to src/ejabberdctl.template

  • Committer: Package Import Robot
  • Author(s): Gerfried Fuchs, Konstantin Khomoutov, Gerfried Fuchs
  • Date: 2011-09-11 16:16:55 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: package-import@ubuntu.com-20110911161655-rz3jall453jo3zek
Tags: 2.1.8-1
[ Konstantin Khomoutov ]
* New upstream release.
* Remove patch fixing DSA-2248-1 (CVE-2011-1753)
  as the fix is now integrated upstream.
* Drop patches from OLPC project implementing @recent@ and @online@
  shared roster groups; support for @online@ is now intergated upstream.
* Add patch fixing version string where applicable (EJAB-1484).
* Bump standards version to 3.9.2

[ Gerfried Fuchs ]
* Add recommended targets build-arch and build-indep to debian/rules.
* Fix spelling error in manpage noticed by lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ejabberdctl.template
76
76
NAME=-name
77
77
[ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && NAME=-sname
78
78
 
79
 
if [ "$FIREWALL_WINDOW" = "" ] ; then
80
 
    KERNEL_OPTS=""
81
 
else
82
 
    KERNEL_OPTS="-kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
 
79
KERNEL_OPTS=""
 
80
if [ "$FIREWALL_WINDOW" != "" ] ; then
 
81
    KERNEL_OPTS="${KERNEL_OPTS} -kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
 
82
fi
 
83
if [ "$INET_DIST_INTERFACE" != "" ] ; then
 
84
    KERNEL_OPTS="${KERNEL_OPTS} -kernel inet_dist_use_interface \"${INET_DIST_INTERFACE}\""
83
85
fi
84
86
 
85
87
ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
127
129
export EJABBERD_DOC_PATH
128
130
export EJABBERD_PID_PATH
129
131
export ERL_CRASH_DUMP
 
132
export ERL_EPMD_ADDRESS
130
133
export ERL_INETRC
131
134
export ERL_MAX_PORTS
132
135
export ERL_MAX_ETS_TABLES
312
315
{
313
316
    CONN_NAME=$1; shift
314
317
    COMMAND=$@
315
 
    $EXEC_CMD "$ERL \
 
318
 
 
319
    CTLEXEC="$ERL \
316
320
      $NAME ${CONN_NAME} \
317
321
      -noinput \
318
322
      -hidden \
319
323
      -pa $EJABBERD_EBIN_PATH \
320
324
      $KERNEL_OPTS \
321
 
      -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
 
325
      -s ejabberd_ctl -extra $ERLANG_NODE"
 
326
 
 
327
    # quote input from the command line
 
328
    for i in $COMMAND; do
 
329
        CTLEXEC="$CTLEXEC '$i'";
 
330
    done
 
331
 
 
332
    $EXEC_CMD "$CTLEXEC"
322
333
}
323
334
 
324
335
# display ctl usage