diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-04-08 01:17:59 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-04-08 01:17:59 +0300 |
| commit | 0648d403a6341030369956ff63d4ba6c336436f5 (patch) | |
| tree | 9ed1b6461056de9128813f56ac6e427de86a67cc /scripts/rabbitmq-env | |
| parent | 64540f2de0ead2b37caab184e7ac43a3349c855c (diff) | |
| parent | c7cae156260fc6509d2274ef452e767c692e3fa3 (diff) | |
| download | rabbitmq-server-git-0648d403a6341030369956ff63d4ba6c336436f5.tar.gz | |
Merge branch 'master' into rabbitmq-server-591
Diffstat (limited to 'scripts/rabbitmq-env')
| -rw-r--r-- | scripts/rabbitmq-env | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 8ceb8c94f2..b59e323e66 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 |