diff options
| author | olgeni <olgeni@FreeBSD.org> | 2016-11-22 07:14:25 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2016-11-22 07:14:25 +0800 |
| commit | 6a8afb5dd2c074ef9ccc4fd6bc31b1f4d902b4a6 (patch) | |
| tree | a5ec197a732188240df7df8dc6d2d6d7cf4799a0 /net | |
| parent | ea65c04a1a6d4af9846c570c10d3a887e245b4ce (diff) | |
| download | freebsd-ports-gnome-6a8afb5dd2c074ef9ccc4fd6bc31b1f4d902b4a6.tar.gz freebsd-ports-gnome-6a8afb5dd2c074ef9ccc4fd6bc31b1f4d902b4a6.tar.zst freebsd-ports-gnome-6a8afb5dd2c074ef9ccc4fd6bc31b1f4d902b4a6.zip | |
Respect RABBITMQ_LOG_BASE setting in rabbitmq-env.conf, if present.
Diffstat (limited to 'net')
| -rw-r--r-- | net/rabbitmq/Makefile | 1 | ||||
| -rw-r--r-- | net/rabbitmq/files/rabbitmq.in | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 586bb4ba3e79..c4828af17cf4 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -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} diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in index f275b6153614..0cf12f344d42 100644 --- a/net/rabbitmq/files/rabbitmq.in +++ b/net/rabbitmq/files/rabbitmq.in @@ -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} -c 'sh -c \"${rabbitmq_ctl} rotate_logs\ 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 |