mirror of
https://git.freebsd.org/ports.git
synced 2025-05-15 16:51:52 -04:00
ac97d7eeb2
This is version 4.x of sysutils/puppet, which is in some large parts incompatible with previous versions. As the C++ rewrite of facter is not resolving some required facts on FreeBSD yet, default to the old version written in Ruby for now.
19 lines
933 B
Ruby
19 lines
933 B
Ruby
--- ext/rack/config.ru.orig 2015-08-09 23:14:59 UTC
|
|
+++ ext/rack/config.ru
|
|
@@ -14,11 +14,11 @@ ARGV << "--rack"
|
|
# Rack applications typically don't start as root. Set --confdir, --vardir,
|
|
# --logdir, --rundir to prevent reading configuration from
|
|
# ~/ based pathing.
|
|
-ARGV << "--confdir" << "/etc/puppetlabs/puppet"
|
|
-ARGV << "--vardir" << "/opt/puppetlabs/server/data/puppetmaster"
|
|
-ARGV << "--logdir" << "/var/log/puppetlabs/puppetmaster"
|
|
-ARGV << "--rundir" << "/var/run/puppetlabs/puppetmaster"
|
|
-ARGV << "--codedir" << "/etc/puppetlabs/code"
|
|
+ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
|
|
+ARGV << "--vardir" << "/var/puppet"
|
|
+ARGV << "--logdir" << "/var/log/puppet"
|
|
+ARGV << "--rundir" << "/var/run/puppet"
|
|
+ARGV << "--codedir" << "%%PREFIX%%/etc/puppet"
|
|
|
|
# always_cache_features is a performance improvement and safe for a master to
|
|
# apply. This is intended to allow agents to recognize new features that may be
|