diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-05 13:58:36 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-05 14:26:40 +0100 |
| commit | 811b0d9772808499fcee154d9a4060afe67a37e3 (patch) | |
| tree | 273fd97efe95ed94076c53db4b632c892bcd00c1 /scripts | |
| parent | 81fde9ecb2f5396687239970380a7d66fd5f53ba (diff) | |
| download | rabbitmq-server-git-811b0d9772808499fcee154d9a4060afe67a37e3.tar.gz | |
Override CONF_ENV_FILE with RABBITMQ_CONF_ENV_FILE
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-env | 11 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat index 27edd0d11e..8fff5ea827 100644 --- a/scripts/rabbitmq-defaults.bat +++ b/scripts/rabbitmq-defaults.bat @@ -46,6 +46,4 @@ REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins" for /f "delims=" %%F in ("!TDP0!..\plugins") do set PLUGINS_DIR=%%~dpsF%%~nF%%~xF
REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf
-if "!RABBITMQ_CONF_ENV_FILE!"=="" (
- set RABBITMQ_CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat
-)
+set CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index dffed035ea..35239620ca 100644 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -65,20 +65,15 @@ RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")" ## Common defaults SERVER_ERL_ARGS="+P 1048576" -# warn about old rabbitmq.conf file, if no new one -if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ - [ ! -f ${CONF_ENV_FILE} ] ; then - echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- " - echo "location has moved to ${CONF_ENV_FILE}" -fi - # We save the current value of $RABBITMQ_PID_FILE in case it was set by # an init script. If $CONF_ENV_FILE overrides it again, we must ignore # it and warn the user. saved_RABBITMQ_PID_FILE=$RABBITMQ_PID_FILE ## Get configuration variables from the configure environment file -[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true +[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE} + +[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true if [ "$saved_RABBITMQ_PID_FILE" -a \ "$saved_RABBITMQ_PID_FILE" != "$RABBITMQ_PID_FILE" ]; then diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index d5df9ddbd6..ea9cf45962 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -47,6 +47,10 @@ REM set SERVER_ERL_ARGS=+P 1048576 REM ## Get configuration variables from the configure environment file
REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true
+if "!RABBITMQ_CONF_ENV_FILE!"=="" (
+ set RABBITMQ_CONF_ENV_FILE=!CONF_ENV_FILE!
+)
+
if exist "!RABBITMQ_CONF_ENV_FILE!" (
call "!RABBITMQ_CONF_ENV_FILE!"
)
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 8ed7319b41..ab2975feb1 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -187,7 +187,7 @@ check_not_empty() { eval value=\$$name if [ -z "$value" ]; then echo "Error: ENV variable should be defined: $1. - Please check rabbitmq-env, rabbitmq-defaults, and $CONF_ENV_FILE script files" + Please check rabbitmq-env, rabbitmq-defaults, and ${RABBITMQ_CONF_ENV_FILE} script files" exit 78 fi } |