diff options
| author | Tim Fox <tim@rabbitmq.com> | 2011-02-17 14:23:05 +0000 |
|---|---|---|
| committer | Tim Fox <tim@rabbitmq.com> | 2011-02-17 14:23:05 +0000 |
| commit | a09bc2995ff7bd6b7dd53ff62ce738ec20740846 (patch) | |
| tree | f3d6f7bf74876d1e92f8d5dfbdba2f0175b37323 /scripts | |
| parent | 8ca4968eee099b90f384859544c1ea6eb738d68e (diff) | |
| parent | 0bc30cc892398e346838eb51097dfd2a8ea8c8f5 (diff) | |
| download | rabbitmq-server-git-a09bc2995ff7bd6b7dd53ff62ce738ec20740846.tar.gz | |
merge default into bug23850
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 |