From owner-svn-ports-head@freebsd.org  Sat Apr 23 15:12:33 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 76754B1AE0B;
 Sat, 23 Apr 2016 15:12:33 +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 43F3314EE;
 Sat, 23 Apr 2016 15:12:33 +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 u3NFCWOm011625;
 Sat, 23 Apr 2016 15:12:32 GMT (envelope-from olgeni@FreeBSD.org)
Received: (from olgeni@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3NFCWmt011623;
 Sat, 23 Apr 2016 15:12:32 GMT (envelope-from olgeni@FreeBSD.org)
Message-Id: <201604231512.u3NFCWmt011623@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, 23 Apr 2016 15:12:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413880 - in head/net/rabbitmq: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Apr 2016 15:12:33 -0000

Author: olgeni
Date: Sat Apr 23 15:12:32 2016
New Revision: 413880
URL: https://svnweb.freebsd.org/changeset/ports/413880

Log:
  Make sure that the Erlang cookie file has mode 600 before
  starting, else RabbitMQ will not run.
  
  MFH:		2016Q2

Modified:
  head/net/rabbitmq/Makefile
  head/net/rabbitmq/files/rabbitmq.in

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Sat Apr 23 15:08:18 2016	(r413879)
+++ head/net/rabbitmq/Makefile	Sat Apr 23 15:12:32 2016	(r413880)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.6.1
+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	Sat Apr 23 15:08:18 2016	(r413879)
+++ head/net/rabbitmq/files/rabbitmq.in	Sat Apr 23 15:12:32 2016	(r413880)
@@ -52,6 +52,10 @@ rabbitmq_start()
 		chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOGDIR}
 	fi
 
+	if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
+		chmod 600 ${RABBITMQ_HOME}/.erlang.cookie
+	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