diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 04:12:17 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 04:12:17 +0000 |
| commit | b9a882564fdd1a66cf30b2c6e58f4105982c4433 (patch) | |
| tree | 3f6bd5a73ee8faa47a50991001845876426bc20c /scripts/rabbitmq-multi | |
| parent | 6f0e6d40c30079764b4e4e7472883d8abb9ff7e9 (diff) | |
| download | rabbitmq-server-git-b9a882564fdd1a66cf30b2c6e58f4105982c4433.tar.gz | |
Moved main configuration from /etc/default/rabbitmq to /etc/rabbitmq/rabbitmq.conf. Updated man pages to reflect the changes. To avoid overwriting the variables those in /etc/default/rabbitmq need to be prefix with INITD_. Added checks in scripts to handle those cases. rpm and debian need to handle /etc/rabbitmq directory.
Diffstat (limited to 'scripts/rabbitmq-multi')
| -rwxr-xr-x | scripts/rabbitmq-multi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 84985e900f..b099a9995d 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -30,20 +30,27 @@ ## Contributor(s): ______________________________________. ## -[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq +[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${INITD_NODENAME} [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${INITD_NODE_IP_ADDRESS} [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0 +[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${INITD_NODE_PORT} [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672 +[ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${INITD_SCRIPT_HOME} [ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME} [ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=$(dirname $0) +[ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${INITD_PIDS_FILE} [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE} [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=/var/lib/rabbitmq/pids +[ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${INITD_MULTI_ERL_ARGS} [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS} [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS= +[ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${INITD_MULTI_START_ARGS} [ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${MULTI_START_ARGS} [ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS= |