diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-10 09:56:49 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-10 09:56:49 +0000 |
| commit | 105a18315f724503b12780c1f55d79826d69bb80 (patch) | |
| tree | 2e8f7320de2dba16f9a407c03c06ab5b5cc9a1a5 /scripts | |
| parent | ca17b12b649de93da7bb811bf59558826bb12a3c (diff) | |
| download | rabbitmq-server-git-105a18315f724503b12780c1f55d79826d69bb80.tar.gz | |
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.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 14 | ||||
| -rw-r--r-- | scripts/rabbitmq-sys | 8 |
2 files changed, 11 insertions, 11 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} diff --git a/scripts/rabbitmq-sys b/scripts/rabbitmq-sys index c58341ef90..45d7cbd742 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" |