diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-04-04 13:38:41 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-04-04 13:38:41 +0100 |
| commit | 487bfdc364ba842c1591bb80b16e7fe0669c9e02 (patch) | |
| tree | 5ce3253f7a0920a1f41760c132136c14a89c8cb2 | |
| parent | 058625e8d49d580ef53dc65365a0fde79c5da425 (diff) | |
| download | rabbitmq-server-bug24020.tar.gz | |
Warn about config only if new config is absentbug24020
| -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 3e173949..a2ef8d3c 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 |