sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Without this change, the puppetserver foreground is non-functional.

Browse source 
This is a useful command when trying to debug ruby inside of the JVM.

Approved by:	mat(mentor)
Differential Revision:	D19137
This commit is contained in:
Zach Leslie 2019-02-10 18:17:58 +00:00
parent b3869722fb
commit ff18f30abd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=492626
4 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sysutils/puppetserver6/Makefile
View file

@ -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

19
sysutils/puppetserver6/files/patch-ext__cli__foreground Normal file
View file

@ -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} \
${@}"

11
sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh Normal file
View file

@ -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

2
sysutils/puppetserver6/pkg-plist
View file

@ -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