diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-18 13:15:17 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-18 13:15:17 +0000 |
| commit | fd5c14578a595b9f9f1d8bfb0fd06c35e0661d75 (patch) | |
| tree | 315b74697510470dd2ee1eb6e2c17e582e512df5 /scripts | |
| parent | 2e73bbd8bfbd0d9a363babd89e04a6b4cc6c8599 (diff) | |
| parent | 62b7f0ba8cc08e4d81511782e5def551425884ee (diff) | |
| download | rabbitmq-server-git-fd5c14578a595b9f9f1d8bfb0fd06c35e0661d75.tar.gz | |
Merging default into bug23810 (debitrot)
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 |