diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-08-17 16:47:02 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-08-17 16:47:02 +0100 |
| commit | b65c5dd93eb843a31365d8aa522a5513f7f11264 (patch) | |
| tree | 59e08cd860ccf46ac975e1f8caf409d2dde3c048 /scripts/rabbitmq-server | |
| parent | 5e28226954220ec56f9fedd177bec3ed03b6de60 (diff) | |
| parent | 4fbe8f7ae4ee7e56bfea864d97b3f9a849207a8b (diff) | |
| download | rabbitmq-server-git-b65c5dd93eb843a31365d8aa522a5513f7f11264.tar.gz | |
merging in from default
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 2883df9da3..f802ec4c51 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -41,7 +41,7 @@ LOG_BASE=/var/log/rabbitmq MNESIA_BASE=/var/lib/rabbitmq/mnesia SERVER_START_ARGS= -[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +. `dirname $0`/rabbitmq-env [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} @@ -75,7 +75,7 @@ fi RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' -RABBITMQ_EBIN_ROOT="`dirname $0`/../ebin" +RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ]; then RABBITMQ_BOOT_FILE="${RABBITMQ_EBIN_ROOT}/rabbit" RABBITMQ_EBIN_PATH="" |