svn commit: r413908 - in branches/2016Q2/net/rabbitmq: . files

[Jimmy Olgeni]

Author: olgeni
Date: Sat Apr 23 20:14:13 2016
New Revision: 413908
URL: https://svnweb.freebsd.org/changeset/ports/413908

Log:
  MFH: r413880
  
  Make sure that the Erlang cookie file has mode 600 before
  starting, else RabbitMQ will not run.
  
  Approved by:	portmgr

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

Modified: branches/2016Q2/net/rabbitmq/Makefile
==============================================================================
--- branches/2016Q2/net/rabbitmq/Makefile	Sat Apr 23 19:54:48 2016	(r413907)
+++ branches/2016Q2/net/rabbitmq/Makefile	Sat Apr 23 20:14:13 2016	(r413908)
@@ -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: branches/2016Q2/net/rabbitmq/files/rabbitmq.in
==============================================================================
--- branches/2016Q2/net/rabbitmq/files/rabbitmq.in	Sat Apr 23 19:54:48 2016	(r413907)
+++ branches/2016Q2/net/rabbitmq/files/rabbitmq.in	Sat Apr 23 20:14:13 2016	(r413908)
@@ -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