diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-04-05 14:09:54 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-04-05 14:09:54 +0100 |
| commit | 90ac3681f16f65d7898c6556c8f723cd53a088fd (patch) | |
| tree | c6893a20e2c678d80a85420f17c2b7e19a655835 /scripts/rabbitmq-env | |
| parent | cd6405f33d6b1a87cb7f34eeb4809e88b9c6256d (diff) | |
| parent | 6f3333c4c116f5644f0271281cf6490eda3f2f40 (diff) | |
| download | rabbitmq-server-git-90ac3681f16f65d7898c6556c8f723cd53a088fd.tar.gz | |
merge heads
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 |