Refactor generic-unix rabbitmq-sys for easy updatability;

simplify macports mods to generic-unix package;
make rabbitmq-env independent of package installation;
adjust rabbitmq-sys in base scripts to allow rabbitmq-env to work everywhere.

1 files changed, 7 insertions, 7 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 060a9c8dcd..97d795b82f 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -36,7 +36,7 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.."
 [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
 NODENAME=rabbit@${HOSTNAME%%.*}
 
-## Set system default values for rabbitmq-env.conf variables to override
+## Set system defaults
 if [ ! -f ${SCRIPT_DIR}/rabbitmq-sys ]; then
     echo -n "WARNING: system defaults are not available -- "
     echo "check the installation completed correctly."
@@ -45,10 +45,10 @@ fi
 
 . ${SCRIPT_DIR}/rabbitmq-sys
 
-## Get configuration variables from the rabbitmq-env.conf file
-if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
-   [ ! -f /etc/rabbitmq/rabbitmq-env.conf ] ; then
-    echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
-    echo "location has moved to /etc/rabbitmq/rabbitmq-env.conf"
+## Get configuration variables from the configure environment file
+if [ -f ${OLD_CONF_ENV_FILE} ] && \
+   [ ! -f ${CONF_ENV_FILE} ] ; then
+    echo -n "WARNING: ignoring ${OLD_CONF_ENV_FILE} -- "
+    echo "location has moved to ${CONF_ENV_FILE}"
 fi
-[ -f /etc/rabbitmq/rabbitmq-env.conf ] && . /etc/rabbitmq/rabbitmq-env.conf
+[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE}