svn commit: r500514 - in head: databases/puppetdb5 databases/puppetdb5/files databases/puppetdb6 databases/puppetdb6/files sysutils/puppetserver5 sysutils/puppetserver5/files sysutils/puppetserver6...
Zach Leslie
zleslie at FreeBSD.org
Tue Apr 30 18:12:03 UTC 2019
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}"
More information about the svn-ports-all
mailing list