From 8a44c08b137fd1b591a9fabd4760bd64938a4d17 Mon Sep 17 00:00:00 2001 From: TomyLobo Date: Thu, 3 Mar 2016 20:26:48 +0100 Subject: [PATCH] Move directory variables up (AMQ-6189) Setting ACTIVEMQ_CONF to a different value and not moving it up will result in login.config being taken from the old location. This commit fixes this by moving these variables above all places they are used in. This closes #172 --- assembly/src/release/bin/env | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env index 5825080f58..e467d7dcef 100644 --- a/assembly/src/release/bin/env +++ b/assembly/src/release/bin/env @@ -23,6 +23,13 @@ # invoke the init-script without a argument an review help section "Configuration of this script" # /etc/default/activemq /.activemqrc /bin/env +# Active MQ installation dirs +# ACTIVEMQ_HOME="/" +# ACTIVEMQ_BASE="$ACTIVEMQ_HOME" +# ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf" +# ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data" +# ACTIVEMQ_TMP="$ACTIVEMQ_BASE/tmp" + # Set jvm memory configuration (minimal/maximum amount of memory) ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G" @@ -87,13 +94,6 @@ if [ -z "$ACTIVEMQ_KILL_MAXSECONDS" ]; then ACTIVEMQ_KILL_MAXSECONDS=30 fi -# Active MQ installation dirs -# ACTIVEMQ_HOME="/" -# ACTIVEMQ_BASE="$ACTIVEMQ_HOME" -# ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf" -# ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data" -# ACTIVEMQ_TMP="$ACTIVEMQ_BASE/tmp" - # Configure a user with non root privileges, if no user is specified do not change user # (the entire activemq installation should be owned by this user) ACTIVEMQ_USER=""