From owner-svn-ports-all@freebsd.org Tue Apr 30 18:12:03 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20B741599A3F; Tue, 30 Apr 2019 18:12:03 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC1018669B; Tue, 30 Apr 2019 18:12:02 +0000 (UTC) (envelope-from zleslie@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 945D9D8DA; Tue, 30 Apr 2019 18:12:02 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3UIC2iF000406; Tue, 30 Apr 2019 18:12:02 GMT (envelope-from zleslie@FreeBSD.org) Received: (from zleslie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3UIC0ae000399; Tue, 30 Apr 2019 18:12:00 GMT (envelope-from zleslie@FreeBSD.org) Message-Id: <201904301812.x3UIC0ae000399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zleslie set sender to zleslie@FreeBSD.org using -f From: Zach Leslie Date: Tue, 30 Apr 2019 18:12:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500514 - in head: databases/puppetdb5 databases/puppetdb5/files databases/puppetdb6 databases/puppetdb6/files sysutils/puppetserver5 sysutils/puppetserver5/files sysutils/puppetserver6... X-SVN-Group: ports-head X-SVN-Commit-Author: zleslie X-SVN-Commit-Paths: in head: databases/puppetdb5 databases/puppetdb5/files databases/puppetdb6 databases/puppetdb6/files sysutils/puppetserver5 sysutils/puppetserver5/files sysutils/puppetserver6 sysutils/puppetserver6/f... X-SVN-Commit-Revision: 500514 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BC1018669B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 30 Apr 2019 18:12:03 -0000 Author: zleslie Date: Tue Apr 30 18:12:00 2019 New Revision: 500514 URL: https://svnweb.freebsd.org/changeset/ports/500514 Log: Ensure java options are utilized Without this change, the doc for the rc script references the ability pass Java opts to the start command, but those references are never used. Here we ensure that thse options are respected and implemented. PR: 237295 Reviewed by: mat(mentor),romain Approved by: mat(mentor),romain Differential Revision: D20010 Modified: head/databases/puppetdb5/Makefile head/databases/puppetdb5/files/puppetdb.in head/databases/puppetdb6/Makefile head/databases/puppetdb6/files/puppetdb.in head/sysutils/puppetserver5/Makefile head/sysutils/puppetserver5/files/puppetserver.in head/sysutils/puppetserver6/Makefile head/sysutils/puppetserver6/files/puppetserver.in Modified: head/databases/puppetdb5/Makefile ============================================================================== --- head/databases/puppetdb5/Makefile Tue Apr 30 17:50:26 2019 (r500513) +++ head/databases/puppetdb5/Makefile Tue Apr 30 18:12:00 2019 (r500514) @@ -2,6 +2,7 @@ PORTNAME= puppetdb PORTVERSION= 5.2.8 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 5 Modified: head/databases/puppetdb5/files/puppetdb.in ============================================================================== --- head/databases/puppetdb5/files/puppetdb.in Tue Apr 30 17:50:26 2019 (r500513) +++ head/databases/puppetdb5/files/puppetdb.in Tue Apr 30 18:12:00 2019 (r500514) @@ -55,7 +55,7 @@ pidfile="/var/run/puppetdb/puppetdb.pid" command="/usr/sbin/daemon" java_cmd="${puppetdb_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main ${puppetdb_args} > ${puppetdb_log_file} 2>&1" +command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main ${puppetdb_args} > ${puppetdb_log_file} 2>&1" required_files="${java_cmd}" Modified: head/databases/puppetdb6/Makefile ============================================================================== --- head/databases/puppetdb6/Makefile Tue Apr 30 17:50:26 2019 (r500513) +++ head/databases/puppetdb6/Makefile Tue Apr 30 18:12:00 2019 (r500514) @@ -2,6 +2,7 @@ PORTNAME= puppetdb PORTVERSION= 6.3.1 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 6 Modified: head/databases/puppetdb6/files/puppetdb.in ============================================================================== --- head/databases/puppetdb6/files/puppetdb.in Tue Apr 30 17:50:26 2019 (r500513) +++ head/databases/puppetdb6/files/puppetdb.in Tue Apr 30 18:12:00 2019 (r500514) @@ -55,7 +55,7 @@ pidfile="/var/run/puppetdb/puppetdb.pid" command="/usr/sbin/daemon" java_cmd="${puppetdb_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" +command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" required_files="${java_cmd}" Modified: head/sysutils/puppetserver5/Makefile ============================================================================== --- head/sysutils/puppetserver5/Makefile Tue Apr 30 17:50:26 2019 (r500513) +++ head/sysutils/puppetserver5/Makefile Tue Apr 30 18:12:00 2019 (r500514) @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 5.3.8 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 5 Modified: head/sysutils/puppetserver5/files/puppetserver.in ============================================================================== --- head/sysutils/puppetserver5/files/puppetserver.in Tue Apr 30 17:50:26 2019 (r500513) +++ head/sysutils/puppetserver5/files/puppetserver.in Tue Apr 30 18:12:00 2019 (r500514) @@ -47,6 +47,7 @@ load_rc_config "${name}" : ${puppetserver_enable="NO"} : ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"} : ${puppetserver_java_home="%%JAVA_HOME%%"} +: ${puppetserver_java_opts=""} : ${puppetserver_user="puppet"} : ${puppetserver_group="puppet"} : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"} @@ -55,7 +56,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid" command="/usr/sbin/daemon" java_cmd="${puppetserver_java_home}/bin/java" procname="${java_cmd}" -command_args="-f -p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" +command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" required_files="${java_cmd}" Modified: head/sysutils/puppetserver6/Makefile ============================================================================== --- head/sysutils/puppetserver6/Makefile Tue Apr 30 17:50:26 2019 (r500513) +++ head/sysutils/puppetserver6/Makefile Tue Apr 30 18:12:00 2019 (r500514) @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 6.3.0 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 6 Modified: head/sysutils/puppetserver6/files/puppetserver.in ============================================================================== --- head/sysutils/puppetserver6/files/puppetserver.in Tue Apr 30 17:50:26 2019 (r500513) +++ head/sysutils/puppetserver6/files/puppetserver.in Tue Apr 30 18:12:00 2019 (r500514) @@ -47,6 +47,7 @@ load_rc_config "${name}" : ${puppetserver_enable="NO"} : ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"} : ${puppetserver_java_home="%%JAVA_HOME%%"} +: ${puppetserver_java_opts=""} : ${puppetserver_user="puppet"} : ${puppetserver_group="puppet"} : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"} @@ -55,7 +56,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid" command="/usr/sbin/daemon" java_cmd="${puppetserver_java_home}/bin/java" procname="${java_cmd}" -command_args="-f -p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" +command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" required_files="${java_cmd}"