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

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

2 files changed, 9 insertions, 8 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}
diff --git a/scripts/rabbitmq-locations b/scripts/rabbitmq-sys-defaults
index 7b7dfa5905..a425f923d8 100644
--- a/scripts/rabbitmq-locations
+++ b/scripts/rabbitmq-sys-defaults
@@ -27,7 +27,6 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
 MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
 ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
 
-OLD_CONF_ENV_FILE=/etc/rabbitmq/rabbitmq.conf
-CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf
-
 PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
+
+CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf