cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

activemqrc -> activemq.conf and protect the file.

Browse Source
This commit is contained in:
ajacoutot 2013-03-18 14:46:28 +00:00
parent d809b3460b
commit c20f42abde
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/apache-activemq/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2013/03/18 11:09:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2013/03/18 14:46:28 ajacoutot Exp $
PKG_ARCH= *
@ -6,7 +6,7 @@ COMMENT= open source message broker implementing JMS 1.1
V= 5.8.0
DISTNAME= apache-activemq-$V
REVISION= 4
REVISION= 5
CATEGORIES= net
@ -37,7 +37,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/activemq/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/activemq/conf
cd ${WRKSRC} && tar cf - * | tar xf - -C ${PREFIX}/activemq/
${INSTALL_DATA} ${FILESDIR}/activemqrc ${PREFIX}/share/examples/activemq/
${INSTALL_DATA} ${FILESDIR}/activemq.conf ${PREFIX}/share/examples/activemq/
mv ${PREFIX}/activemq/conf ${PREFIX}/share/examples/activemq/
cd ${PREFIX}/activemq && ln -sf /var/db/activemq/data data
cd ${PREFIX}/activemq && ln -sf /var/db/activemq/tmp tmp

0
net/apache-activemq/files/activemqrc → net/apache-activemq/files/activemq.conf
View File

10
net/apache-activemq/patches/patch-bin_activemq
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bin_activemq,v 1.3 2013/03/18 10:52:56 ajacoutot Exp $
$OpenBSD: patch-bin_activemq,v 1.4 2013/03/18 14:46:28 ajacoutot Exp $
--- bin/activemq.orig Wed Feb 6 17:53:14 2013
+++ bin/activemq Wed Mar 13 16:03:24 2013
@@ -29,7 +29,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-bin_activemq,v 1.3 2013/03/18 10:52:56 ajacoutot Exp $
# ------------------------------------------------------------------------
# CONFIGURATION
-ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc"
+ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemqrc $HOME/.activemqrc"
+ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemq.conf $HOME/.activemqrc"
# Backup invocation parameters
COMMANDLINE_ARGS="$@"
@ -15,7 +15,7 @@ $OpenBSD: patch-bin_activemq,v 1.3 2013/03/18 10:52:56 ajacoutot Exp $
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}/activemqrc-instance-${INST} $HOME/.activemqrc-instance-${INST}"
+ ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemq-instance-${INST}.conf $HOME/.activemqrc-instance-${INST}"
echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
fi
@ -32,11 +32,11 @@ $OpenBSD: patch-bin_activemq,v 1.3 2013/03/18 10:52:56 ajacoutot Exp $
Configuration of this script:
- The configuration of this script can be placed on /etc/default/activemq or $HOME/.activemqrc.
+ The configuration of this script can be placed on ${SYSCONFDIR}/activemqrc or $HOME/.activemqrc.
+ The configuration of this script can be placed on ${SYSCONFDIR}/activemq.conf or $HOME/.activemqrc.
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}/activemqrc-instance-<INSTANCENAME> and
+ This changes the configuration location to ${SYSCONFDIR}/activemq-instance-<INSTANCENAME>.conf and
\$HOME/.activemqrc-instance-<INSTANCENAME>. Configuration files in /etc have higher precedence.
EOF
exit $RET

10
net/apache-activemq/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2013/03/18 11:09:56 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2013/03/18 14:46:28 ajacoutot Exp $
@comment needs a RW homedir to prevent java.io.IOException
@newgroup _activemq:714
@newuser _activemq:714:714:daemon:Apache ActiveMQ:/var/db/activemq:/sbin/nologin
@ -377,8 +377,12 @@ activemq/webapps/styles/
activemq/webapps/styles/site.css
activemq/webapps/styles/type-settings.css
share/examples/activemq/
share/examples/activemq/activemqrc
@sample ${SYSCONFDIR}/activemqrc
share/examples/activemq/activemq.conf
@mode 0640
@group _activemq
@sample ${SYSCONFDIR}/activemq.conf
@mode
@group
share/examples/activemq/conf/
@mode 0750
@owner _activemq