diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-07-22 17:51:52 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-07-22 17:51:52 +0100 |
| commit | 118b59e2b3d2ef3ddefe60a3ef5514a7a8de7420 (patch) | |
| tree | 4f9888a6720df4e296614e6004e24e8ba4ee0ad5 /scripts/rabbitmq-env | |
| parent | ac62154a544c4903c2821668c74a9f111fa8b944 (diff) | |
| parent | 57076e95920128cbd425e3e252cd4948aa6c0dd4 (diff) | |
| download | rabbitmq-server-git-118b59e2b3d2ef3ddefe60a3ef5514a7a8de7420.tar.gz | |
Merge in 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 |