From owner-svn-ports-branches@freebsd.org  Sat Feb 27 13:03:49 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B801DAB5B75;
 Sat, 27 Feb 2016 13:03:49 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6BF091C69;
 Sat, 27 Feb 2016 13:03:49 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1RD3mrn093011;
 Sat, 27 Feb 2016 13:03:48 GMT (envelope-from olgeni@FreeBSD.org)
Received: (from olgeni@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1RD3muD093009;
 Sat, 27 Feb 2016 13:03:48 GMT (envelope-from olgeni@FreeBSD.org)
Message-Id: <201602271303.u1RD3muD093009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: olgeni set sender to
 olgeni@FreeBSD.org using -f
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sat, 27 Feb 2016 13:03:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r409662 - in branches/2016Q1/net/rabbitmq: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Feb 2016 13:03:49 -0000

Author: olgeni
Date: Sat Feb 27 13:03:48 2016
New Revision: 409662
URL: https://svnweb.freebsd.org/changeset/ports/409662

Log:
  MFH: r408713
  
  Make sure that /var/log/rabbitmq has the correct owner.
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2016Q1/net/rabbitmq/Makefile
  branches/2016Q1/net/rabbitmq/files/rabbitmq.in
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/net/rabbitmq/Makefile
==============================================================================
--- branches/2016Q1/net/rabbitmq/Makefile	Sat Feb 27 12:56:24 2016	(r409661)
+++ branches/2016Q1/net/rabbitmq/Makefile	Sat Feb 27 13:03:48 2016	(r409662)
@@ -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}

Modified: branches/2016Q1/net/rabbitmq/files/rabbitmq.in
==============================================================================
--- branches/2016Q1/net/rabbitmq/files/rabbitmq.in	Sat Feb 27 12:56:24 2016	(r409661)
+++ branches/2016Q1/net/rabbitmq/files/rabbitmq.in	Sat Feb 27 13:03:48 2016	(r409662)
@@ -34,6 +34,7 @@ status_cmd="su -m ${rabbitmq_user} -c 's
 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