diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-18 17:29:33 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-18 17:29:33 +0000 |
| commit | 3eff985435a3127ce5081aeac68b9444584ee908 (patch) | |
| tree | 49d03b4c1a44046c43136efc546c31781a844242 /scripts/rabbitmq-env | |
| parent | 16b26187a4a46ef1973849a5c84d8d6c77f4e964 (diff) | |
| parent | f6ce046bacedd9830cc909fa5f698db56f9e96e5 (diff) | |
| download | rabbitmq-server-git-3eff985435a3127ce5081aeac68b9444584ee908.tar.gz | |
Merge bug23553 (Present managed socket count in mgmt plugin)
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 |