Page MenuHomeFreeBSD
Files F107576730

D20010.id56872.diff
No OneTemporary
Actions

D20010.id56872.diff
View Options

Index: head/databases/puppetdb5/Makefile
===================================================================
--- head/databases/puppetdb5/Makefile
+++ head/databases/puppetdb5/Makefile
@@ -2,6 +2,7 @@
PORTNAME= puppetdb
PORTVERSION= 5.2.8
+PORTREVISION= 1
CATEGORIES= databases java
MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/
PKGNAMESUFFIX= 5
Index: head/databases/puppetdb5/files/puppetdb.in
===================================================================
--- head/databases/puppetdb5/files/puppetdb.in
+++ head/databases/puppetdb5/files/puppetdb.in
@@ -55,7 +55,7 @@
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}"
Index: head/databases/puppetdb6/Makefile
===================================================================
--- head/databases/puppetdb6/Makefile
+++ head/databases/puppetdb6/Makefile
@@ -2,6 +2,7 @@
PORTNAME= puppetdb
PORTVERSION= 6.3.1
+PORTREVISION= 1
CATEGORIES= databases java
MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/
PKGNAMESUFFIX= 6
Index: head/databases/puppetdb6/files/puppetdb.in
===================================================================
--- head/databases/puppetdb6/files/puppetdb.in
+++ head/databases/puppetdb6/files/puppetdb.in
@@ -55,7 +55,7 @@
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}"
Index: head/sysutils/puppetserver5/Makefile
===================================================================
--- head/sysutils/puppetserver5/Makefile
+++ head/sysutils/puppetserver5/Makefile
@@ -2,6 +2,7 @@
PORTNAME= puppetserver
PORTVERSION= 5.3.8
+PORTREVISION= 1
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 5
Index: head/sysutils/puppetserver5/files/puppetserver.in
===================================================================
--- head/sysutils/puppetserver5/files/puppetserver.in
+++ head/sysutils/puppetserver5/files/puppetserver.in
@@ -47,6 +47,7 @@
: ${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 @@
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}"
Index: head/sysutils/puppetserver6/Makefile
===================================================================
--- head/sysutils/puppetserver6/Makefile
+++ head/sysutils/puppetserver6/Makefile
@@ -2,6 +2,7 @@
PORTNAME= puppetserver
PORTVERSION= 6.3.0
+PORTREVISION= 1
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 6
Index: head/sysutils/puppetserver6/files/puppetserver.in
===================================================================
--- head/sysutils/puppetserver6/files/puppetserver.in
+++ head/sysutils/puppetserver6/files/puppetserver.in
@@ -47,6 +47,7 @@
: ${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 @@
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}"

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 17, 3:34 AM (18 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15832861
Default Alt Text
D20010.id56872.diff (5 KB)

Event Timeline