34 lines
1.7 KiB
Plaintext
34 lines
1.7 KiB
Plaintext
$OpenBSD: patch-bin_activemq,v 1.9 2016/02/25 07:35:31 jasper Exp $
|
|
--- bin/activemq.orig Tue Feb 2 19:26:49 2016
|
|
+++ bin/activemq Sat Feb 13 12:31:41 2016
|
|
@@ -170,10 +170,10 @@ fi
|
|
# For using instances
|
|
if ( basename $0 | grep "activemq-instance-" > /dev/null);then
|
|
INST="`basename $0|sed 's/^activemq-instance-//;s/\.sh$//'`"
|
|
- ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
|
|
+ ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
|
|
echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
|
|
else
|
|
- ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env"
|
|
+ ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemq.conf $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env"
|
|
fi
|
|
|
|
# load activemq configuration
|
|
@@ -557,7 +557,6 @@ invoke_stop(){
|
|
echo
|
|
echo "INFO: Regular shutdown not successful, sending SIGKILL to process"
|
|
invoke_kill
|
|
- RET="$?"
|
|
fi
|
|
elif [ -f "$ACTIVEMQ_PIDFILE" ];then
|
|
echo "ERROR: No or outdated process id in '$ACTIVEMQ_PIDFILE'"
|
|
@@ -631,7 +630,7 @@ Configuration of this script:
|
|
Modify $ACTIVEMQ_BASE/bin/env or create a copy of that file on a suitable location.
|
|
To use additional configurations for running multiple instances on the same operating system
|
|
rename or symlink script to a name matching to activemq-instance-<INSTANCENAME>.
|
|
- This changes the configuration location to /etc/default/activemq-instance-<INSTANCENAME> and
|
|
+ This changes the configuration location to ${SYSCONFDIR}/activemq-instance-<INSTANCENAME> and
|
|
\$HOME/.activemqrc-instance-<INSTANCENAME>.
|
|
EOF
|
|
exit 1
|