svn commit: r426771 - in head/net/rabbitmq: . files
Jimmy Olgeni
olgeni at FreeBSD.org
Mon Nov 21 23:14:27 UTC 2016
Author: olgeni
Date: Mon Nov 21 23:14:25 2016
New Revision: 426771
URL: https://svnweb.freebsd.org/changeset/ports/426771
Log:
Respect RABBITMQ_LOG_BASE setting in rabbitmq-env.conf, if present.
Modified:
head/net/rabbitmq/Makefile
head/net/rabbitmq/files/rabbitmq.in
Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile Mon Nov 21 22:32:09 2016 (r426770)
+++ head/net/rabbitmq/Makefile Mon Nov 21 23:14:25 2016 (r426771)
@@ -3,6 +3,7 @@
PORTNAME= rabbitmq
PORTVERSION= 3.6.5
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
Modified: head/net/rabbitmq/files/rabbitmq.in
==============================================================================
--- head/net/rabbitmq/files/rabbitmq.in Mon Nov 21 22:32:09 2016 (r426770)
+++ head/net/rabbitmq/files/rabbitmq.in Mon Nov 21 23:14:25 2016 (r426771)
@@ -24,6 +24,7 @@ load_rc_config $name
rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server"
rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl"
+rabbitmq_env_conf="%%PREFIX%%/etc/rabbitmq/rabbitmq-env.conf"
pidfile="/var/run/${name}.pid"
daemon_pidfile="/var/run/${name}-daemon.pid"
@@ -33,8 +34,13 @@ rotate_logs_cmd="su -m ${rabbitmq_user}
status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
extra_commands="rotate_logs status"
+: ${RABBITMQ_LOG_BASE:=/var/log/${name}}
+
+if [ -f ${rabbitmq_env_conf} ]; then
+ . ${rabbitmq_env_conf}
+fi
+
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.
@@ -48,8 +54,8 @@ rabbitmq_start()
chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME}
fi
- if [ -d ${RABBITMQ_LOGDIR} ]; then
- chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOGDIR}
+ if [ -d ${RABBITMQ_LOG_BASE} ]; then
+ chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
fi
if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
More information about the svn-ports-head
mailing list