diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-07-01 15:47:36 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-07-01 15:47:36 +0300 |
| commit | 018720752583824c3aaf3cf68193970559350890 (patch) | |
| tree | e3f9820c4879469b001fac43d433a790b206c773 | |
| parent | ddf89003752eca8cacc38333d1b42f29242ae4ac (diff) | |
| download | rabbitmq-server-git-018720752583824c3aaf3cf68193970559350890.tar.gz | |
Introduce RABBITMQ_BOOT_MODULE (for *nix for now)
| -rw-r--r-- | scripts/rabbitmq-defaults | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 1cf9152afb..9ee5127f5a 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -26,6 +26,8 @@ SASL_BOOT_FILE=start_sasl ## Set default values +BOOT_MODULE="rabbit" + CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index eede788a93..43ff3abdd8 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -152,6 +152,8 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${PID_FILE} [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid +[ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE} + [ "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 diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index a6f4be9902..bd72ba6caa 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -21,7 +21,7 @@ RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput" -[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot " +[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s $RABBITMQ_BOOT_MODULE boot " case "$(uname -s)" in CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait |