diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-22 11:01:17 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-22 11:01:17 +0000 |
| commit | e39014044d83e14b0ef86215bbb7c87a7d8ed4cb (patch) | |
| tree | 7c4d3e417bfbe926e54ec2fbc8234b07e42bce6d /scripts/rabbitmq-env | |
| parent | dab04dfa063ad10c8e72869d2d30a8189047e6f1 (diff) | |
| parent | 443296009f45d631dde279a0b1b9549641643701 (diff) | |
| download | rabbitmq-server-git-e39014044d83e14b0ef86215bbb7c87a7d8ed4cb.tar.gz | |
Merge in default
Diffstat (limited to 'scripts/rabbitmq-env')
| -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 |