From owner-svn-ports-all@freebsd.org Sun Feb 10 18:18:00 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 E874814D561A; Sun, 10 Feb 2019 18:17:59 +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 8A05C8A349; Sun, 10 Feb 2019 18:17:59 +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 7355B1C2C1; Sun, 10 Feb 2019 18:17:59 +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 x1AIHxC2055760; Sun, 10 Feb 2019 18:17:59 GMT (envelope-from zleslie@FreeBSD.org) Received: (from zleslie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1AIHwPn055756; Sun, 10 Feb 2019 18:17:58 GMT (envelope-from zleslie@FreeBSD.org) Message-Id: <201902101817.x1AIHwPn055756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zleslie set sender to zleslie@FreeBSD.org using -f From: Zach Leslie Date: Sun, 10 Feb 2019 18:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492626 - in head/sysutils/puppetserver6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zleslie X-SVN-Commit-Paths: in head/sysutils/puppetserver6: . files X-SVN-Commit-Revision: 492626 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8A05C8A349 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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, 10 Feb 2019 18:18:00 -0000 Author: zleslie Date: Sun Feb 10 18:17:58 2019 New Revision: 492626 URL: https://svnweb.freebsd.org/changeset/ports/492626 Log: Without this change, the puppetserver foreground is non-functional. This is a useful command when trying to debug ruby inside of the JVM. Approved by: mat(mentor) Differential Revision: D19137 Added: head/sysutils/puppetserver6/files/patch-ext__cli__foreground (contents, props changed) head/sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh (contents, props changed) Modified: head/sysutils/puppetserver6/Makefile head/sysutils/puppetserver6/pkg-plist Modified: head/sysutils/puppetserver6/Makefile ============================================================================== --- head/sysutils/puppetserver6/Makefile Sun Feb 10 18:17:14 2019 (r492625) +++ head/sysutils/puppetserver6/Makefile Sun Feb 10 18:17:58 2019 (r492626) @@ -15,7 +15,8 @@ RUN_DEPENDS= bash>=0:shells/bash \ jruby>=9.1:lang/jruby \ puppet6>=0:sysutils/puppet6 \ rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \ - rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet + rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \ + sudo>=1:security/sudo USES= shebangfix USE_RC_SUBR= puppetserver @@ -42,7 +43,7 @@ post-patch: ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \ ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \ ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver \ - ext/cli_defaults/cli-defaults.sh + ext/cli_defaults/cli-defaults.sh ext/cli/foreground @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \ -e 's|%%RUBY_VER%%|${RUBY_VER}|' \ @@ -61,6 +62,8 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code @${MKDIR} ${STAGEDIR}/var/log/puppetserver @${MKDIR} ${STAGEDIR}/var/puppet/server + @${MKDIR} ${STAGEDIR}/var/puppet/server/data + @${MKDIR} ${STAGEDIR}/var/run/puppetserver ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample Added: head/sysutils/puppetserver6/files/patch-ext__cli__foreground ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/puppetserver6/files/patch-ext__cli__foreground Sun Feb 10 18:17:58 2019 (r492626) @@ -0,0 +1,19 @@ +--- ext/cli/foreground.orig 2019-02-08 20:38:48.978660000 -0800 ++++ ext/cli/foreground 2019-02-08 21:31:43.683308000 -0800 +@@ -1,6 +1,6 @@ + #!/usr/bin/env bash + +-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter" ++restartfile="/var/puppet/server/data/puppetserver/restartcounter" + cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh + + if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then +@@ -31,7 +31,7 @@ + -Djava.security.egd=/dev/urandom \ + -cp "$CLASSPATH" \ + clojure.main -m puppetlabs.trapperkeeper.main \ +- --config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \ ++ --config ${CONFIG} --bootstrap-config %%ETCDIR%%/services.d \ + --restart-file "${restartfile}" \ + ${TK_ARGS} \ + ${@}" Added: head/sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh Sun Feb 10 18:17:58 2019 (r492626) @@ -0,0 +1,11 @@ +--- ext/ezbake-functions.sh.orig 2019-02-08 21:16:18.212575000 -0800 ++++ ext/ezbake-functions.sh 2019-02-08 21:16:49.208798000 -0800 +@@ -126,7 +126,7 @@ + local group="${GROUP:-puppet}" + + if [ ! -e "$restartfile" ]; then +- /usr/bin/install --directory --owner=$user --group=$group --mode=755 "$restart_file_base_dir" ++ /usr/bin/install -d -o $user -g $group -m 755 "$restart_file_base_dir" + if [ $? -ne 0 ]; then + echo "Unable to create or set permissions for restart file at ${restart_file_base_dir}" 1>&2 + return 1 Modified: head/sysutils/puppetserver6/pkg-plist ============================================================================== --- head/sysutils/puppetserver6/pkg-plist Sun Feb 10 18:17:14 2019 (r492625) +++ head/sysutils/puppetserver6/pkg-plist Sun Feb 10 18:17:58 2019 (r492626) @@ -24,3 +24,5 @@ @dir(puppet,puppet,750) /var/log/puppetserver @dir(puppet,puppet,755) /var/puppet @dir(puppet,puppet,750) /var/puppet/server +@dir(puppet,puppet,750) /var/puppet/server/data +@dir(puppet,puppet,750) /var/run/puppetserver