diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-02 10:48:18 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-02 10:48:18 +0100 |
| commit | 0ae1bba1dd2d519a9b50540e76f79ae518b810f7 (patch) | |
| tree | 7a55098c74ec108cdb5d094ed16ccd9eb661e06c /scripts/rabbitmq-env | |
| parent | 9b10c994f7bb39dac5de2a43c1a21301a164a930 (diff) | |
| parent | d3509448afcd1f6f0783c13bc877560b43c9b5f5 (diff) | |
| download | rabbitmq-server-git-0ae1bba1dd2d519a9b50540e76f79ae518b810f7.tar.gz | |
merge default into bug23504
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index df4b24d8fc..a2ef8d3ceb 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -37,4 +37,9 @@ 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 ] && \ + [ ! -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 +[ -f /etc/rabbitmq/rabbitmq-env.conf ] && . /etc/rabbitmq/rabbitmq-env.conf |