diff options
author | Tim Watson <tim@rabbitmq.com> | 2014-03-18 20:25:11 +0000 |
---|---|---|
committer | Tim Watson <tim@rabbitmq.com> | 2014-03-18 20:25:11 +0000 |
commit | 87a1e06d6834e3740ac21034ce110b24ea693e9b (patch) | |
tree | 7142853c50b8176f762cbdf2d76addf48eba6a1f /scripts/rabbitmq-plugins | |
parent | ec5086953c6b6739255041b9d30d420257f2ceba (diff) | |
parent | 19767b76842b73006d6840950d572a777077eadf (diff) | |
download | rabbitmq-server-87a1e06d6834e3740ac21034ce110b24ea693e9b.tar.gz |
Merge default into bug24926
Diffstat (limited to 'scripts/rabbitmq-plugins')
-rwxr-xr-x | scripts/rabbitmq-plugins | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 2ec45be0..2213e20b 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -21,6 +21,7 @@ ##--- Set environment vars RABBITMQ_<var_name> to defaults if not set +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR} @@ -35,4 +36,5 @@ exec ${ERL_DIR}erl \ -s rabbit_plugins_main \ -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \ -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \ + -nodename $RABBITMQ_NODENAME \ -extra "$@" |