summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-02-02 18:12:45 +0000
committerEmile Joubert <emile@rabbitmq.com>2011-02-02 18:12:45 +0000
commit173fc2f73c15217f607a1887521af8d05f775f04 (patch)
treefdd8ffcdac299e13d633901141854c2ea234137d /scripts
parent6773a4905b1c7505b517f248db536967c18fcb61 (diff)
downloadrabbitmq-server-git-173fc2f73c15217f607a1887521af8d05f775f04.tar.gz
First version of renaming rabbitmq.conf
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-env6
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