svn commit: r425861 - in head/net-mgmt/riemann: . files

[Kurt Jaeger]

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 <dch at skunkwerks.at> (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 at 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%%
+ at dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%ETCDIR%%/conf.d