Date: Mon, 27 Jul 2015 13:04:58 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392977 - in head/net/rabbitmq: . files Message-ID: <201507271304.t6RD4wxG062925@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Mon Jul 27 13:04:57 2015 New Revision: 392977 URL: https://svnweb.freebsd.org/changeset/ports/392977 Log: Upgrade to version 3.5.4. - Make sure that all content of /var/db/rabbitmq is owned by rabbitmq at startup. - Only set HOME when actually starting the rabbitmq process. Modified: head/net/rabbitmq/Makefile head/net/rabbitmq/distinfo (contents, props changed) head/net/rabbitmq/files/rabbitmq.in Modified: head/net/rabbitmq/Makefile ============================================================================== --- head/net/rabbitmq/Makefile Mon Jul 27 13:00:37 2015 (r392976) +++ head/net/rabbitmq/Makefile Mon Jul 27 13:04:57 2015 (r392977) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rabbitmq -PORTVERSION= 3.5.3 +PORTVERSION= 3.5.4 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} Modified: head/net/rabbitmq/distinfo ============================================================================== --- head/net/rabbitmq/distinfo Mon Jul 27 13:00:37 2015 (r392976) +++ head/net/rabbitmq/distinfo Mon Jul 27 13:04:57 2015 (r392977) @@ -1,2 +1,2 @@ -SHA256 (rabbitmq-server-3.5.3.tar.gz) = 45c797ac4f7a9d2ece54eafa537da05dc3e66e43d45b4825509fe47113844363 -SIZE (rabbitmq-server-3.5.3.tar.gz) = 3727143 +SHA256 (rabbitmq-server-3.5.4.tar.gz) = f79814d5fd5574734f599ef570ddace02ce4e47a1441cd052c568cde4d6ca3a4 +SIZE (rabbitmq-server-3.5.4.tar.gz) = 3730770 Modified: head/net/rabbitmq/files/rabbitmq.in ============================================================================== --- head/net/rabbitmq/files/rabbitmq.in Mon Jul 27 13:00:37 2015 (r392976) +++ head/net/rabbitmq/files/rabbitmq.in Mon Jul 27 13:04:57 2015 (r392977) @@ -32,7 +32,7 @@ rotate_logs_cmd="su -m ${rabbitmq_user} status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'" extra_commands="rotate_logs status" -export HOME=/var/db/${name} +export RABBITMQ_HOME=/var/db/${name} # Prevent conflicts with amqp_client and rabbit_common applications that # may be installed in ERL_LIBS. @@ -42,11 +42,11 @@ rabbitmq_start() { echo "Starting ${name}." - if [ -f ${HOME}/.erlang.cookie ]; then - chown ${rabbitmq_user}:${rabbitmq_user} ${HOME}/.erlang.cookie + if [ -d ${RABBITMQ_HOME} ]; then + chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME} fi - daemon -c -f -u ${rabbitmq_user} -p ${pidfile} ${rabbitmq_server} + env HOME=${RABBITMQ_HOME} daemon -c -f -u ${rabbitmq_user} -p ${pidfile} ${rabbitmq_server} local _attempt=10
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507271304.t6RD4wxG062925>