diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-09 11:40:54 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-09 11:40:54 +0000 |
| commit | c3271ee044b876ba792941e9e8293524ccec3b34 (patch) | |
| tree | 831eeabdbab6032f9f64189806d938c5e981a35f | |
| parent | c7805bc316a0b6cd13469b9748923b4664b8141d (diff) | |
| download | rabbitmq-server-git-c3271ee044b876ba792941e9e8293524ccec3b34.tar.gz | |
Correct a problem I introduced: make RABBITMQ_START_RABBIT depend on RABBITMQ_NODE_ONLY.
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index d6b8b168bc..6f488d5a1a 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -44,8 +44,6 @@ [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} -[ "x" = "x$RABBITMQ_START_RABBIT" ] && RABBITMQ_START_RABBIT=${START_RABBIT} -[ "x" = "x$RABBITMQ_START_RABBIT" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS= @@ -66,6 +64,9 @@ else RABBITMQ_CLUSTER_CONFIG_OPTION="" fi +RABBITMQ_START_RABBIT= +[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit' + exec erl \ -pa "`dirname $0`/../ebin" \ ${RABBITMQ_START_RABBIT} \ @@ -87,4 +88,3 @@ exec erl \ ${RABBITMQ_CLUSTER_CONFIG_OPTION} \ ${RABBITMQ_SERVER_START_ARGS} \ "$@" - |