diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-06-10 13:24:31 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-06-10 13:24:31 +0100 |
| commit | cb09a100711be74fa6d7dc9cee275147289ec1eb (patch) | |
| tree | e409216d2387bd2b866594f1032d4a41551b9201 /scripts/rabbitmq-multi | |
| parent | f634ec37692ba97eb445b944bc08927d9071beaa (diff) | |
| download | rabbitmq-server-git-cb09a100711be74fa6d7dc9cee275147289ec1eb.tar.gz | |
Make nodename available to rabbitmq-env in startup scripts
Diffstat (limited to 'scripts/rabbitmq-multi')
| -rwxr-xr-x | scripts/rabbitmq-multi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index c6e1a69dc8..4bf4359897 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -29,7 +29,8 @@ ## ## Contributor(s): ______________________________________. ## -NODENAME=rabbit +[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` +NODENAME=rabbit@${HOSTNAME%%.*} SCRIPT_HOME=$(dirname $0) PIDS_FILE=/var/lib/rabbitmq/pids MULTI_ERL_ARGS= @@ -53,7 +54,7 @@ else fi fi [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}@${HOSTNAME%%.*} +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME} [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE} [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS} |