Date: Mon, 13 Mar 2017 18:25:44 +0000 (UTC) From: Kirill Ponomarew <krion@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436104 - in head/net-mgmt/riemann: . files Message-ID: <201703131825.v2DIPiS8084225@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: krion Date: Mon Mar 13 18:25:44 2017 New Revision: 436104 URL: https://svnweb.freebsd.org/changeset/ports/436104 Log: Fix Java CLASSPATH settings to launch riemann PR: 217457 Submitted by: jeromer@fastmail.net Approved by: maintainer, mat (mentor) Differential Revision: https://reviews.freebsd.org/D9977 Modified: head/net-mgmt/riemann/Makefile head/net-mgmt/riemann/files/riemann.in Modified: head/net-mgmt/riemann/Makefile ============================================================================== --- head/net-mgmt/riemann/Makefile Mon Mar 13 18:17:03 2017 (r436103) +++ head/net-mgmt/riemann/Makefile Mon Mar 13 18:25:44 2017 (r436104) @@ -3,6 +3,7 @@ PORTNAME= riemann PORTVERSION= 0.2.12 +PORTREVISION= 1 CATEGORIES= net-mgmt java MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ @@ -17,7 +18,6 @@ NO_ARCH= yes USE_JAVA= yes JAVA_VERSION= 1.7+ -SUB_FILES= ${PORTNAME} SUB_LIST= JAVA_HOME=${JAVA_HOME} \ RIEMANN_USER=${RIEMANN_USER} \ RIEMANN_GROUP=${RIEMANN_GROUP} \ Modified: head/net-mgmt/riemann/files/riemann.in ============================================================================== --- head/net-mgmt/riemann/files/riemann.in Mon Mar 13 18:17:03 2017 (r436103) +++ head/net-mgmt/riemann/files/riemann.in Mon Mar 13 18:25:44 2017 (r436104) @@ -12,14 +12,16 @@ # riemann_enable (bool): Set to NO by default. # Set it to YES to enable riemann. # -# riemann_config (string): Optional full path for riemann config file -# riemann_user (user): Set to riemann by default. -# riemann_group (group): Set to riemann by default. -# riemann_jarfile (string): Optional path to a custom jarfile. -# riemann_java_home (args): Specify which JVM to use, if not default. -# riemann_min_mem (num): Minumum JVM heap size, 256m by default. -# riemann_max_mem (num): Maximum JVM heap size, 1g by default. -# riemann_java_opts (args): Additional JVM properties or arguments. +# riemann_config (string): Optional full path for riemann config file +# riemann_user (user): Set to riemann by default. +# riemann_group (group): Set to riemann by default. +# riemann_jarfile (string): Optional path to a custom jarfile. +# riemann_java_home (args): Specify which JVM to use, if not default. +# riemann_java_classpath (args): Specify a custom Java ClassPath. +# riemann_min_mem (num): Minumum JVM heap size, 256m by default. +# riemann_max_mem (num): Maximum JVM heap size, 1g by default. +# riemann_java_opts (args): Additional JVM properties or arguments. + . /etc/rc.subr name="riemann" @@ -35,7 +37,9 @@ load_rc_config $name : ${riemann_java_home:="%%JAVA_HOME%%"} : ${riemann_min_mem:="256m"} : ${riemann_max_mem:="1g"} +: ${riemann_java_classpath:=${riemann_jarfile}} : ${riemann_java_opts:=" -server \ + -cp ${riemann_java_classpath} \ -Dapp=${name} \ -Xms${riemann_min_mem} \ -Xmx${riemann_max_mem} \ @@ -59,7 +63,7 @@ command="/usr/sbin/daemon" command_args="-f -t ${name} -c -r -P ${pidfile} \ ${riemann_java_home}/bin/java \ ${riemann_java_opts} \ - -jar ${riemann_jarfile} ${riemann_config}" + riemann.bin start ${riemann_config}" required_files="${java_cmd} ${riemann_config}" riemann_prestart()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703131825.v2DIPiS8084225>