diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-07-27 13:04:57 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-07-27 13:04:57 +0000 |
| commit | 3216bbb6c8b3b24a8a4e7c9a90e4e99ce855e91c (patch) | |
| tree | 1fd4f68661b502287e5710e01e7c08eff119555f /net | |
| parent | efdfbc3f1d2d4ddfc43143be19b77e1f3e41b79a (diff) | |
| download | freebsd-ports-3216bbb6c8b3b24a8a4e7c9a90e4e99ce855e91c.zip | |
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.
Diffstat (limited to 'net')
| -rw-r--r-- | net/rabbitmq/Makefile | 2 | ||||
| -rw-r--r-- | net/rabbitmq/distinfo | 4 | ||||
| -rw-r--r-- | net/rabbitmq/files/rabbitmq.in | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 1d8702a6452c..d083bf493a9c 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -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} diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo index bb7442230bd9..240f3cb2571b 100644 --- a/net/rabbitmq/distinfo +++ b/net/rabbitmq/distinfo @@ -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 diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in index c576d62a845e..ea4b863d45cc 100644 --- a/net/rabbitmq/files/rabbitmq.in +++ b/net/rabbitmq/files/rabbitmq.in @@ -32,7 +32,7 @@ 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" -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 |