diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-10-12 22:08:12 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-10-12 22:08:12 +0100 |
| commit | 78cd23612bdf9602ab36cf0f9bca5d164b1f7c1f (patch) | |
| tree | 1a38845c7a9513663ac50db5efd4e4cfb9793447 /scripts/rabbitmq-server | |
| parent | 41f6b85d766098ac7ee62bfbaf5b41bf4cee82b2 (diff) | |
| parent | 73bf86e97f63597da2bbd6567d5940d05d47924f (diff) | |
| download | rabbitmq-server-git-78cd23612bdf9602ab36cf0f9bca5d164b1f7c1f.tar.gz | |
merge default into bug24308
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index deca5b3042..11cc7215bb 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -21,6 +21,7 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq LOG_BASE=/var/log/rabbitmq MNESIA_BASE=/var/lib/rabbitmq/mnesia SERVER_START_ARGS= +ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins . `dirname $0`/rabbitmq-env @@ -52,6 +53,7 @@ fi [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand +[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="${RABBITMQ_HOME}/plugins" ## Log rotation @@ -74,7 +76,7 @@ if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then -hidden \ -s rabbit_prelaunch \ -sname rabbitmqprelaunch$$ \ - -extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}" + -extra "$RABBITMQ_ENABLED_PLUGINS_FILE" "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}" then RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit" RABBITMQ_EBIN_PATH="" |