diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-11 17:17:16 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-11 17:17:16 +0100 |
| commit | 7a46bea96a056657cfbb35889376463c88bc4a47 (patch) | |
| tree | 2b5b2529178ed2861cde571ca945453c5cf36d07 /scripts/rabbitmq-env | |
| parent | 122972d7a3013610de74591fafb48b201618643b (diff) | |
| parent | d156a1183511156148facc36862c113ebeff014f (diff) | |
| download | rabbitmq-server-git-7a46bea96a056657cfbb35889376463c88bc4a47.tar.gz | |
Merge from 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 |