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.

4 files changed, 22 insertions, 26 deletions

diff --git a/packaging/generic-unix/rabbitmq-sys b/packaging/generic-unix/rabbitmq-sys
index efd20766..3151c979 100644
--- a/packaging/generic-unix/rabbitmq-sys
+++ b/packaging/generic-unix/rabbitmq-sys
@@ -16,17 +16,19 @@
 ##
 
 ### generic-unix ###
+### next line potentially updated in package install steps, do not alter
+SYS_PREFIX=${RABBITMQ_HOME}
 
 ## Set system default values
 SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
 -kernel inet_default_connect_options [{nodelay,true}]"
 
-CONFIG_FILE=${RABBITMQ_HOME}/rabbitmq
+CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
+LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
+MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
+ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
 
-LOG_BASE=${RABBITMQ_HOME}/log
+OLD_CONF_ENV_FILE=${CONFIG_FILE}.conf
+CONF_ENV_FILE=${CONFIG_FILE}-env.conf
 
-MNESIA_BASE=${RABBITMQ_HOME}/mnesia
-
-PLUGINS_DIR=${RABBITMQ_HOME}/plugins
-
-ENABLED_PLUGINS_FILE=${RABBITMQ_HOME}/enabled_plugins
+PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 360fb394..9ab64eaf 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -87,14 +87,8 @@ post-destroot {
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
-    reinplace -E "s:(/etc/rabbitmq/rabbitmq):${prefix}\\1:g" \
-        ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE ENABLED_PLUGINS_FILE} {
-        reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
-            ${realsbin}/rabbitmq-server \
-            ${realsbin}/rabbitmqctl \
-            ${realsbin}/rabbitmq-plugins
-    }
+    reinplace -E 's:^SYS_PREFIX=${RABBITMQ_HOME}$:SYS_PREFIX='"${prefix}"':' \
+        ${realsbin}/rabbitmq-sys \
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-server
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 060a9c8d..97d795b8 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}
diff --git a/scripts/rabbitmq-sys b/scripts/rabbitmq-sys
index c58341ef..45d7cbd7 100644
--- a/scripts/rabbitmq-sys
+++ b/scripts/rabbitmq-sys
@@ -20,11 +20,11 @@ SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
 -kernel inet_default_connect_options [{nodelay,true}]"
 
 CONFIG_FILE=/etc/rabbitmq/rabbitmq
-
 LOG_BASE=/var/log/rabbitmq
-
 MNESIA_BASE=/var/lib/rabbitmq/mnesia
+ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins
 
-PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
+OLD_CONF_ENV_FILE=${CONFIG_FILE}.conf
+CONF_ENV_FILE=${CONFIG_FILE}-env.conf
 
-ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins
+PLUGINS_DIR="${RABBITMQ_HOME}/plugins"