diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-plugins | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index c57151733e..cb0ab56f18 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -17,7 +17,9 @@ . `dirname $0`/rabbitmq-env -[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins +ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins + +[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} [ "x" = "x$RABBITMQ_PLUGINS_DIST_DIR" ] && RABBITMQ_PLUGINS_DIST_DIR="${RABBITMQ_HOME}/plugins" diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index aa84ec3fff..23ca6ba63f 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,7 +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=/etc/rabbitmq/enabled_plugins +[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} [ "x" = "x$RABBITMQ_PLUGINS_DIST_DIR" ] && RABBITMQ_PLUGINS_DIST_DIR="${RABBITMQ_HOME}/plugins" ## Log rotation |