diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-17 11:56:49 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-17 11:56:49 +0000 |
| commit | 68195be9eeb8e7ee4889f95074da4da344e09b65 (patch) | |
| tree | 13377b4ca6b8b9e7895853af1fb0e9314d71601a /scripts/rabbitmq-env | |
| parent | 9b3035c005223eeb0dadaa52dc5666c5c900d074 (diff) | |
| parent | 49b3f4ff64291e13524cf16f66bc5c991f94091e (diff) | |
| download | rabbitmq-server-git-68195be9eeb8e7ee4889f95074da4da344e09b65.tar.gz | |
Merging default into bug23657
Diffstat (limited to 'scripts/rabbitmq-env')
| -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 |