summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2016-02-12 10:48:25 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2016-02-12 10:48:25 +0000
commit089b0b36f0a8140e05b5f13430f5f3ad5c828cd2 (patch)
tree4294fa70e986ddce865e1dae876ca7461aecfe5c /net
parent- Update to 4.6.0 (diff)
Make sure that /var/log/rabbitmq has the correct owner.
Notes
Notes: svn path=/head/; revision=408713
Diffstat (limited to 'net')
-rw-r--r--net/rabbitmq/Makefile2
-rw-r--r--net/rabbitmq/files/rabbitmq.in5
2 files changed, 6 insertions, 1 deletions
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 91a9a5ad60b4..ed7afe999fab 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rabbitmq
PORTVERSION= 3.5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index 528bb035f5bc..f1fbada3cd70 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -34,6 +34,7 @@ status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
extra_commands="rotate_logs status"
export RABBITMQ_HOME=/var/db/${name}
+export RABBITMQ_LOGDIR=/var/log/${name}
# Prevent conflicts with amqp_client and rabbit_common applications that
# may be installed in ERL_LIBS.
@@ -47,6 +48,10 @@ rabbitmq_start()
chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME}
fi
+ if [ -d ${RABBITMQ_LOGDIR} ]; then
+ chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOGDIR}
+ fi
+
env HOME=${RABBITMQ_HOME} daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server}
debug "Running: rabbitmqctl wait ${pidfile}"
${rabbitmq_ctl} wait ${pidfile} >/dev/null 2>&1