[activemq] 05/05: Rebase init-debian-default-values.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository activemq.

commit 6c89e1245c54f74df5a0f29104f90fcc87d34976
Author: Markus Koschany <apo at debian.org>
Date:   Tue Mar 15 19:45:15 2016 +0100

    Rebase init-debian-default-values.patch
---
 debian/patches/init-debian-default-values.patch | 45 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/init-debian-default-values.patch b/debian/patches/init-debian-default-values.patch
new file mode 100644
index 0000000..0498c51
--- /dev/null
+++ b/debian/patches/init-debian-default-values.patch
@@ -0,0 +1,45 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 15 Mar 2016 19:43:05 +0100
+Subject: init debian default values
+
+---
+ assembly/src/release/bin/activemq | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
+index 261493b..91f1e3e 100755
+--- a/assembly/src/release/bin/activemq
++++ b/assembly/src/release/bin/activemq
+@@ -101,12 +101,12 @@ getActiveMQHome(){
+ 
+ # Active MQ installation dir
+ if [ -z "$ACTIVEMQ_HOME" ] ; then
+-  ACTIVEMQ_HOME="`getActiveMQHome`"
++  ACTIVEMQ_HOME="/usr/share/activemq"
+ fi
+ 
+ # Active MQ base dir
+ if [ -z "$ACTIVEMQ_BASE" ] ; then
+-  ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
++  ACTIVEMQ_BASE="/var/lib/activemq"
+ fi
+ 
+ # Configure user specified classpath here or externally using this variable
+@@ -130,7 +130,7 @@ fi
+ 
+ # Configure a user with non root privileges, if no user is specified do not change user
+ if [ -z "$ACTIVEMQ_USER" ] ; then
+-    ACTIVEMQ_USER=""
++    ACTIVEMQ_USER="activemq"
+ fi
+ 
+ # Active MQ data directory
+@@ -159,7 +159,7 @@ fi
+ 
+ # Location of the pidfile
+ if [ -z "$ACTIVEMQ_PIDFILE" ]; then
+-  ACTIVEMQ_PIDFILE="$ACTIVEMQ_DATA/activemq.pid"
++  ACTIVEMQ_PIDFILE="/run/activemq.pid"
+ fi
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 467718b..9094414 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ exclude-geronimo-jca.patch
 exclude-jmdns.patch
 disable-broker-test-dependency.patch
 disable-jetty-all-dependency.patch
+init-debian-default-values.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git