From owner-svn-ports-all@freebsd.org Sun Mar 17 16:38:24 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B47A91541ABF; Sun, 17 Mar 2019 16:38:24 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E7E686C17; Sun, 17 Mar 2019 16:38:24 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F0A02C92C; Sun, 17 Mar 2019 16:38:23 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2HGcNKV073102; Sun, 17 Mar 2019 16:38:23 GMT (envelope-from zleslie@FreeBSD.org) Received: (from zleslie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2HGcNt9073098; Sun, 17 Mar 2019 16:38:23 GMT (envelope-from zleslie@FreeBSD.org) Message-Id: <201903171638.x2HGcNt9073098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zleslie set sender to zleslie@FreeBSD.org using -f From: Zach Leslie Date: Sun, 17 Mar 2019 16:38:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496072 - in head/sysutils: puppetserver5 puppetserver5/files puppetserver6 puppetserver6/files X-SVN-Group: ports-head X-SVN-Commit-Author: zleslie X-SVN-Commit-Paths: in head/sysutils: puppetserver5 puppetserver5/files puppetserver6 puppetserver6/files X-SVN-Commit-Revision: 496072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1E7E686C17 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2019 16:38:25 -0000 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}"