mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 11:03:09 -04:00
ea5dcc2fb1
- Unbreak on FreeBSD 12+ (this version bundles an updated version of jRuby which allows running the PuppetServer on hosts with 64 bits inodes); - Override the jRuby bundled ffi.rb to workaround a NullPointerException when trying to open an inexistent file; - Remove deprecated Java flags; Release notes: https://puppet.com/docs/puppetserver/latest/release_notes.html#puppet-server-660 With hat: puppet
19 lines
745 B
Text
19 lines
745 B
Text
--- ext/cli/foreground.orig 2019-09-17 14:05:56 UTC
|
|
+++ ext/cli/foreground
|
|
@@ -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
|
|
@@ -30,7 +30,7 @@ fi
|
|
COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \
|
|
-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} \
|
|
${@}"
|