diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-04-08 14:57:26 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-04-08 14:57:26 +0100 |
| commit | a164bb8c72406a9573e1c45072c03c34e841b0aa (patch) | |
| tree | cc569819a2134b6510b0e3c59867d9080585b14a /scripts/rabbitmq-env | |
| parent | e2760302b51aba3bb807db2ff6e580ba40fa7b98 (diff) | |
| parent | 642bf663adb9d4326cc75c6f3a01c5b9882d02d2 (diff) | |
| download | rabbitmq-server-git-a164bb8c72406a9573e1c45072c03c34e841b0aa.tar.gz | |
merge bug24006 into default
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 3e17394981..a2ef8d3ceb 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -37,7 +37,8 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." NODENAME=rabbit@${HOSTNAME%%.*} # Load configuration from the rabbitmq.conf file -if [ -f /etc/rabbitmq/rabbitmq.conf ]; then +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" fi |