diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-26 11:33:40 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-26 11:33:40 +0100 |
| commit | b40e1084efac1f3f8a4f998371050caf4cb87bb6 (patch) | |
| tree | 4cf253cde0e5a3e42d00fa4d23285c0969e2a7af /scripts | |
| parent | 94c2476a2ebc3db11c106fdba03640ed85f34ea7 (diff) | |
| download | rabbitmq-server-git-b40e1084efac1f3f8a4f998371050caf4cb87bb6.tar.gz | |
use a specialized wrapper for rabbitmq-plugins
All the scripts assume that they are run as ${RABBITMQ_HOME}/bin/script_name
and use this to extract RABBITMQ_HOME, so we do need a minimal wrapper for
rabbitmq-plugins.
I don't know if the 'cd /var/lib/rabbitmq' is necessary; it probably isn't for
rabbitmq-plugins, but might as well leave it in.
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 |