diff options
author | Steve Powell <steve@rabbitmq.com> | 2012-01-04 15:57:19 +0000 |
---|---|---|
committer | Steve Powell <steve@rabbitmq.com> | 2012-01-04 15:57:19 +0000 |
commit | b61b2492794a9e53a2532c4ad285bd80d422a7f2 (patch) | |
tree | eb642ae96a58bae551357d0bcf7620c8853eddb3 /scripts/rabbitmq-plugins | |
parent | a8b01410a9d90f0e178f6614b5c9f0c2e686fff0 (diff) | |
download | rabbitmq-server-b61b2492794a9e53a2532c4ad285bd80d422a7f2.tar.gz |
Move non-empty defaults to rabbitmq-env
- rationalise server-settings
- correctly override PLUGINS_DIR
- allow use of PID_FILE override
- simplify NODE_IP_ADDRESS and NODE_PORT setting
Diffstat (limited to 'scripts/rabbitmq-plugins')
-rwxr-xr-x | scripts/rabbitmq-plugins | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 4c6cb1fa..247cbfe2 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -15,13 +15,16 @@ ## Copyright (c) 2007-2011 VMware, Inc. All rights reserved. ## +# Get default settings with user overrides for (RABBITMQ_)<var_name> +# Non-empty defaults should be set in rabbitmq-env . `dirname $0`/rabbitmq-env -ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins +##--- Set environment vars RABBITMQ_<var_name> to defaults if not set [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} +[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR} -[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="${RABBITMQ_HOME}/plugins" +##--- End of overridden <var_name> variables exec erl \ -pa "${RABBITMQ_HOME}/ebin" \ |