svn commit: r496072 - in head/sysutils: puppetserver5 puppetserver5/files puppetserver6 puppetserver6/files

[Zach Leslie]

Author: zleslie
Date: Sun Mar 17 16:38:22 2019
New Revision: 496072
URL: https://svnweb.freebsd.org/changeset/ports/496072

Log:
  Add -f to puppetserver daemon call
  
  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

Modified:
  head/sysutils/puppetserver5/Makefile
  head/sysutils/puppetserver5/files/puppetserver.in
  head/sysutils/puppetserver6/Makefile
  head/sysutils/puppetserver6/files/puppetserver.in

Modified: head/sysutils/puppetserver5/Makefile
==============================================================================
--- head/sysutils/puppetserver5/Makefile	Sun Mar 17 15:34:49 2019	(r496071)
+++ head/sysutils/puppetserver5/Makefile	Sun Mar 17 16:38:22 2019	(r496072)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	5.3.7
+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	Sun Mar 17 15:34:49 2019	(r496071)
+++ head/sysutils/puppetserver5/files/puppetserver.in	Sun Mar 17 16:38:22 2019	(r496072)
@@ -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}"

Modified: head/sysutils/puppetserver6/Makefile
==============================================================================
--- head/sysutils/puppetserver6/Makefile	Sun Mar 17 15:34:49 2019	(r496071)
+++ head/sysutils/puppetserver6/Makefile	Sun Mar 17 16:38:22 2019	(r496072)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	6.2.1
+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	Sun Mar 17 15:34:49 2019	(r496071)
+++ head/sysutils/puppetserver6/files/puppetserver.in	Sun Mar 17 16:38:22 2019	(r496072)
@@ -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}"