summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Powell <steve@rabbitmq.com>2012-01-26 15:25:41 +0000
committerSteve Powell <steve@rabbitmq.com>2012-01-26 15:25:41 +0000
commit657c67686350c0c82a02b49c489e2dc2d22f00e6 (patch)
tree42c7c61373909ba340a5ea9cda2cdc972aa2984e
parentc81990cb4d151e2994bc0baafaf72c77ea9f6ed6 (diff)
downloadrabbitmq-server-657c67686350c0c82a02b49c489e2dc2d22f00e6.tar.gz
Change CONFIG_FILE, LOG_BASE, MNESIA_BASE and ENABLED_PLUGINS_FILE defaults
- CONFIG_FILE to ${RABBIT_HOME}/rabbitmq - LOG_BASE to ${RABBIT_HOME}/log - MNESIA_BASE to ${RABBIT_HOME}/mnesia - ENABLED_PLUGINS_FILE to ${RABBIT_HOME}/enabled_plugins
-rwxr-xr-xscripts/rabbitmq-env12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 58677d14..1983ef85 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -39,13 +39,13 @@ NODENAME=rabbit@${HOSTNAME%%.*}
## Set (non-empty) default values for rabbitmq-env.conf variables to override
SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
-kernel inet_default_connect_options [{nodelay,true}]"
-CONFIG_FILE=/etc/rabbitmq/rabbitmq
-LOG_BASE=/var/log/rabbitmq
-MNESIA_BASE=/var/lib/rabbitmq/mnesia
-PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
-ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins
+CONFIG_FILE=${RABBITMQ_HOME}/rabbitmq
+LOG_BASE=${RABBITMQ_HOME}/log
+MNESIA_BASE=${RABBITMQ_HOME}/mnesia
+PLUGINS_DIR=${RABBITMQ_HOME}/plugins
+ENABLED_PLUGINS_FILE=${RABBITMQ_HOME}/enabled_plugins
-## Load configuration from the rabbitmq.conf file
+## Get configuration variables from the rabbitmq-env.conf file
if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
[ ! -f /etc/rabbitmq/rabbitmq-env.conf ] ; then
echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "