diff options
| author | David Wragg <dpw@lshift.net> | 2009-08-20 13:58:22 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-08-20 13:58:22 +0100 |
| commit | dd56a8132e6076e8690e5cb1fba2da567fbb2997 (patch) | |
| tree | 27440ae83e18a3f9e126349f1e9a35d833a43e7a /scripts/rabbitmq-server | |
| parent | 5f3ee0a97a30a9dcd06d16efcab53716b52949c8 (diff) | |
| parent | 49157676d8179402e9474e80ed25e8aa6f95087c (diff) | |
| download | rabbitmq-server-git-dd56a8132e6076e8690e5cb1fba2da567fbb2997.tar.gz | |
Merge default into bug19973, resolving conflict
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="" |