diff options
| author | Paul Jones <paulj@lshift.net> | 2009-08-28 15:40:18 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-08-28 15:40:18 +0100 |
| commit | 3e32eb614d61b2fbaa0301250c82280c71b6f4a7 (patch) | |
| tree | 502f58faaf5d681fb8287bd659791b0e174f4e45 /scripts/rabbitmq-server | |
| parent | e7a42e3e545061309773f9ca172016181285275e (diff) | |
| parent | e0c502266bdb5f0e7d6de05cae0a731c76983bc0 (diff) | |
| download | rabbitmq-server-git-3e32eb614d61b2fbaa0301250c82280c71b6f4a7.tar.gz | |
Merged default into bug17880
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 41e84639ba..547220b4a5 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="" |