diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-20 15:13:20 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-20 15:13:20 +0000 |
| commit | 783c28fc1ff31620fa99a26280a583f9da8a9c06 (patch) | |
| tree | e2fb03b3933b107b8b17b302d568994208c8f1e9 /scripts/rabbitmq-server | |
| parent | 9c8b9d142e64b6975029f5c41421c3c4dc3022e9 (diff) | |
| parent | 71077f0a21145fbd72db936b95c5075c0910e3e6 (diff) | |
| download | rabbitmq-server-git-783c28fc1ff31620fa99a26280a583f9da8a9c06.tar.gz | |
Merge v1_5 into bug20329
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 572262c97e..6273804f56 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -30,7 +30,7 @@ ## Contributor(s): ______________________________________. ## -[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq +[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit @@ -43,7 +43,7 @@ -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \ -kernel inet_default_connect_options [{nodelay,true}]" [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} -[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config +[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} @@ -73,6 +73,11 @@ fi RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' +# we need to turn off path expansion because some of the vars, notably +# RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and +# there is no other way of preventing their expansion. +set -f + exec erl \ -pa "`dirname $0`/../ebin" \ ${RABBITMQ_START_RABBIT} \ |