cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -f to puppetserver daemon call

Browse Source 
Without this in place, the rc script does not successfully start the
puppetserver service on hardware or virtualized systems, leaving jails as the
only functional way to run puppetserver.

PR:		236389
Reviewed by:	mat(mentor)
Approved by:	mat(mentor)
Differential Revision:	D19610
This commit is contained in:
Zach Leslie 2019-03-17 16:38:22 +00:00
parent a8cd7eeb9d
commit 54be3c7f55
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=496072
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/puppetserver5/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= puppetserver
PORTVERSION= 5.3.7
PORTREVISION= 1
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 5

2
sysutils/puppetserver5/files/puppetserver.in
View File

@ -55,7 +55,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid"
command="/usr/sbin/daemon"
java_cmd="${puppetserver_java_home}/bin/java"
procname="${java_cmd}"
command_args="-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} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
required_files="${java_cmd}"

1
sysutils/puppetserver6/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= puppetserver
PORTVERSION= 6.2.1
PORTREVISION= 1
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 6

2
sysutils/puppetserver6/files/puppetserver.in
View File

@ -55,7 +55,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid"
command="/usr/sbin/daemon"
java_cmd="${puppetserver_java_home}/bin/java"
procname="${java_cmd}"
command_args="-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} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
required_files="${java_cmd}"