diff options
| author | Marek Majkowski <marek@rabbitmq.com> | 2011-02-16 17:44:57 +0000 |
|---|---|---|
| committer | Marek Majkowski <marek@rabbitmq.com> | 2011-02-16 17:44:57 +0000 |
| commit | 90eab55daaa93e2f986627e680fda4fe072dd7e3 (patch) | |
| tree | 0136263cbe568d0b2ed33ba69b34c6fa95d565bb /scripts | |
| parent | 8b17365e74f87a761f79a3a3d7ab7e537b6a3792 (diff) | |
| parent | 71e720a3756155d453bc0206139030107ca2615d (diff) | |
| download | rabbitmq-server-git-90eab55daaa93e2f986627e680fda4fe072dd7e3.tar.gz | |
bug21741 merged into default
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index df4b24d8fc..3e17394981 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -37,4 +37,8 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." NODENAME=rabbit@${HOSTNAME%%.*} # Load configuration from the rabbitmq.conf file -[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +if [ -f /etc/rabbitmq/rabbitmq.conf ]; then + echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- " + echo "location has moved to /etc/rabbitmq/rabbitmq-env.conf" +fi +[ -f /etc/rabbitmq/rabbitmq-env.conf ] && . /etc/rabbitmq/rabbitmq-env.conf |