diff options
| author | Zach Leslie <zleslie@FreeBSD.org> | 2019-03-17 16:38:22 +0000 |
|---|---|---|
| committer | Zach Leslie <zleslie@FreeBSD.org> | 2019-03-17 16:38:22 +0000 |
| commit | 54be3c7f550b56fe2e41279e3a46b42e14ff1231 (patch) | |
| tree | 945880662cabd71815f430bd9da1ef233ca80208 /sysutils/puppetserver5 | |
| parent | a8cd7eeb9ddbfca4d4086eb407e7663c9090ec91 (diff) | |
| download | ports-54be3c7f550b56fe2e41279e3a46b42e14ff1231.tar.gz ports-54be3c7f550b56fe2e41279e3a46b42e14ff1231.zip | |
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
Notes
Notes:
svn path=/head/; revision=496072
Diffstat (limited to 'sysutils/puppetserver5')
| -rw-r--r-- | sysutils/puppetserver5/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/puppetserver5/files/puppetserver.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sysutils/puppetserver5/Makefile b/sysutils/puppetserver5/Makefile index 513ebbc9520f..8a021436ef8a 100644 --- a/sysutils/puppetserver5/Makefile +++ b/sysutils/puppetserver5/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 5.3.7 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 5 diff --git a/sysutils/puppetserver5/files/puppetserver.in b/sysutils/puppetserver5/files/puppetserver.in index 41d11616f242..ac30c1449e0b 100644 --- a/sysutils/puppetserver5/files/puppetserver.in +++ b/sysutils/puppetserver5/files/puppetserver.in @@ -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}" |