From owner-svn-ports-head@freebsd.org Fri Nov 11 05:53:45 2016 Return-Path: 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 ABBF6C3AFC7; Fri, 11 Nov 2016 05:53:45 +0000 (UTC) (envelope-from pi@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 821661DCA; Fri, 11 Nov 2016 05:53:45 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAB5ri6s050189; Fri, 11 Nov 2016 05:53:44 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAB5riWU050185; Fri, 11 Nov 2016 05:53:44 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201611110553.uAB5riWU050185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Fri, 11 Nov 2016 05:53:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425861 - in head/net-mgmt/riemann: . 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.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2016 05:53:45 -0000 Author: pi Date: Fri Nov 11 05:53:44 2016 New Revision: 425861 URL: https://svnweb.freebsd.org/changeset/ports/425861 Log: net-mgmt/riemann: several changes to the port itself - fix reload under daemon(8) using pkill - use new upstream master site - add conf.d for more complex configurations - add named daemon(8) process info PR: 212671 Submitted by: Dave Cottlehuber (maintainer) Modified: head/net-mgmt/riemann/Makefile head/net-mgmt/riemann/distinfo head/net-mgmt/riemann/files/riemann.in head/net-mgmt/riemann/pkg-plist Modified: head/net-mgmt/riemann/Makefile ============================================================================== --- head/net-mgmt/riemann/Makefile Fri Nov 11 05:19:19 2016 (r425860) +++ head/net-mgmt/riemann/Makefile Fri Nov 11 05:53:44 2016 (r425861) @@ -3,9 +3,9 @@ PORTNAME= riemann PORTVERSION= 0.2.11 +PORTREVISION= 1 CATEGORIES= net-mgmt java -MASTER_SITES= https://wintermute.skunkwerks.at/${PORTNAME}/releases/${PORTVERSION}/ \ - http://aphyr.com/${PORTNAME}/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= dch@skunkwerks.at COMMENT= Monitors distributed systems @@ -50,6 +50,7 @@ do-install: ${MKDIR} \ ${STAGEDIR}${JAVAJARDIR} \ ${STAGEDIR}${ETCDIR} \ + ${STAGEDIR}${ETCDIR}/conf.d \ ${STAGEDIR}${RIEMANN_LOGDIR} ${INSTALL_DATA} \ ${WRKSRC}/lib/${PORTNAME}.jar \ Modified: head/net-mgmt/riemann/distinfo ============================================================================== --- head/net-mgmt/riemann/distinfo Fri Nov 11 05:19:19 2016 (r425860) +++ head/net-mgmt/riemann/distinfo Fri Nov 11 05:53:44 2016 (r425861) @@ -1,2 +1,3 @@ +TIMESTAMP = 1473805695 SHA256 (riemann-0.2.11.tar.bz2) = 5e7982002685f6fa7716782c57e227e4b4eeaa4c14a77ab586aac5ecf114e933 SIZE (riemann-0.2.11.tar.bz2) = 40503519 Modified: head/net-mgmt/riemann/files/riemann.in ============================================================================== --- head/net-mgmt/riemann/files/riemann.in Fri Nov 11 05:19:19 2016 (r425860) +++ head/net-mgmt/riemann/files/riemann.in Fri Nov 11 05:53:44 2016 (r425861) @@ -56,7 +56,7 @@ load_rc_config $name pidfile="%%RIEMANN_PIDFILE%%" command="/usr/sbin/daemon" -command_args="-f -c -r -P ${pidfile} \ +command_args="-f -t ${name} -c -r -P ${pidfile} \ ${riemann_java_home}/bin/java \ ${riemann_java_opts} \ -jar ${riemann_jarfile} ${riemann_config}" @@ -66,6 +66,11 @@ riemann_prestart() { install -o ${riemann_user} /dev/null ${pidfile} } -start_precmd=${name}_prestart +start_precmd="${name}_prestart" + +# support SIGHUP to reload config file using pkill. parent pid +# is that of daemon(8) and not of riemann's JVM instance +extra_commands="reload" +reload_cmd="pkill -SIGHUP -U ${riemann_user} -G ${riemann_group} -f Dapp=riemann" run_rc_command "$1" Modified: head/net-mgmt/riemann/pkg-plist ============================================================================== --- head/net-mgmt/riemann/pkg-plist Fri Nov 11 05:19:19 2016 (r425860) +++ head/net-mgmt/riemann/pkg-plist Fri Nov 11 05:53:44 2016 (r425861) @@ -1,3 +1,4 @@ %%JAVAJARDIR%%/riemann.jar @sample %%ETCDIR%%/riemann.config.sample @dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%% +@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%ETCDIR%%/conf.d