diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-23 13:50:38 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-23 13:50:38 +0000 |
| commit | 0b06530a5532549f7de8d57d624fac546961fb97 (patch) | |
| tree | 827493c951daf439e9cea382fa7c85ff4e01cf22 /scripts/rabbitmq-env | |
| parent | 32d11d570edcf1ae20ef5806e23edca47ae00ad6 (diff) | |
| parent | 245592bc7051cfcb16cfd0dff84085d1294e8146 (diff) | |
| download | rabbitmq-server-git-0b06530a5532549f7de8d57d624fac546961fb97.tar.gz | |
Merging bug23727 to bug23554
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 |