From owner-svn-ports-all@freebsd.org Mon Nov 21 23:14:27 2016 Return-Path: Delivered-To: svn-ports-all@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 07674C4DADC; Mon, 21 Nov 2016 23:14:27 +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 B007B6CC; Mon, 21 Nov 2016 23:14:26 +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 uALNEPQi009613; Mon, 21 Nov 2016 23:14:25 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALNEPX5009611; Mon, 21 Nov 2016 23:14:25 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201611212314.uALNEPX5009611@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Mon, 21 Nov 2016 23:14:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426771 - 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 23:14:27 -0000 Author: olgeni Date: Mon Nov 21 23:14:25 2016 New Revision: 426771 URL: https://svnweb.freebsd.org/changeset/ports/426771 Log: Respect RABBITMQ_LOG_BASE setting in rabbitmq-env.conf, if present. Modified: head/net/rabbitmq/Makefile head/net/rabbitmq/files/rabbitmq.in Modified: head/net/rabbitmq/Makefile ============================================================================== --- head/net/rabbitmq/Makefile Mon Nov 21 22:32:09 2016 (r426770) +++ head/net/rabbitmq/Makefile Mon Nov 21 23:14:25 2016 (r426771) @@ -3,6 +3,7 @@ PORTNAME= rabbitmq PORTVERSION= 3.6.5 +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 Mon Nov 21 22:32:09 2016 (r426770) +++ head/net/rabbitmq/files/rabbitmq.in Mon Nov 21 23:14:25 2016 (r426771) @@ -24,6 +24,7 @@ load_rc_config $name rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server" rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl" +rabbitmq_env_conf="%%PREFIX%%/etc/rabbitmq/rabbitmq-env.conf" pidfile="/var/run/${name}.pid" daemon_pidfile="/var/run/${name}-daemon.pid" @@ -33,8 +34,13 @@ rotate_logs_cmd="su -m ${rabbitmq_user} status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'" extra_commands="rotate_logs status" +: ${RABBITMQ_LOG_BASE:=/var/log/${name}} + +if [ -f ${rabbitmq_env_conf} ]; then + . ${rabbitmq_env_conf} +fi + 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. @@ -48,8 +54,8 @@ rabbitmq_start() chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME} fi - if [ -d ${RABBITMQ_LOGDIR} ]; then - chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOGDIR} + if [ -d ${RABBITMQ_LOG_BASE} ]; then + chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE} fi if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then