diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-10-17 18:17:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-10-17 18:17:13 +0100 |
| commit | 2478b40901922dcf923a978dcbe7bea7979e1eb7 (patch) | |
| tree | 5ba6ce62b18ab66411a3414ec8dc7ff2f9cd2536 /scripts/rabbitmq-env | |
| parent | ca64918f95642f0b4c1a108528d64166f3cf86b7 (diff) | |
| parent | c33ba94384546db803bee2ea9b8124d4f7e774c2 (diff) | |
| download | rabbitmq-server-git-2478b40901922dcf923a978dcbe7bea7979e1eb7.tar.gz | |
Merge bug18626
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 7429844088..8b0e1ccd56 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -39,8 +39,17 @@ set -e SCRIPT_DIR=`dirname $SCRIPT_PATH` RABBITMQ_HOME="${SCRIPT_DIR}/.." -[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` -NODENAME=rabbit@${HOSTNAME%%.*} + +[ "x" = "x$RABBITMQ_USE_LONGNAME" ] && RABBITMQ_USE_LONGNAME=${USE_LONGNAME} +if [ "xtrue" = "x$RABBITMQ_USE_LONGNAME" ] ; then + RABBITMQ_NAME_TYPE=-name + [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname --fqdn` + NODENAME=rabbit@${HOSTNAME} +else + RABBITMQ_NAME_TYPE=-sname + [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` + NODENAME=rabbit@${HOSTNAME%%.*} +fi ## Set defaults . ${SCRIPT_DIR}/rabbitmq-defaults |