mirror of
https://git.freebsd.org/ports.git
synced 2025-07-08 04:49:17 -04:00
- 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
12 lines
573 B
Bash
12 lines
573 B
Bash
--- ext/cli_defaults/cli-defaults.sh.orig 2019-09-17 14:05:56 UTC
|
|
+++ ext/cli_defaults/cli-defaults.sh
|
|
@@ -1,7 +1,7 @@
|
|
-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
|
|
+INSTALL_DIR="%%DATADIR%%"
|
|
|
|
if [ -n "$JRUBY_JAR" ]; then
|
|
echo "Warning: the JRUBY_JAR setting is no longer needed and will be ignored." 1>&2
|
|
fi
|
|
|
|
-CLASSPATH="${CLASSPATH}:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/facter.jar:/opt/puppetlabs/server/data/puppetserver/jars/*"
|
|
+CLASSPATH="${CLASSPATH}:/usr/local/lib/ruby/vendor_ruby/facter.jar:/opt/puppetlabs/server/data/puppetserver/jars/*"
|