Get generic-unix sys-defaults to check for global locations

(and rename rabbitmq-locations to rabbitmq-sys-defaults).

1 files changed, 7 insertions, 5 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 3eb6952431..80e34e813a 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -36,13 +36,15 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.."
 [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
 NODENAME=rabbit@${HOSTNAME%%.*}
 
-## Get system default locations
-. ${SCRIPT_DIR}/rabbitmq-locations
+## Get system defaults
+. ${SCRIPT_DIR}/rabbitmq-sys-defaults
 
-## Get configuration variables from the configure environment file
-if [ -f ${OLD_CONF_ENV_FILE} ] && \
+# 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 ${OLD_CONF_ENV_FILE} -- "
+    echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
     echo "location has moved to ${CONF_ENV_FILE}"
 fi
+
+## Get configuration variables from the configure environment file
 [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE}