diff options
Diffstat (limited to 'sysutils/puppet5/files/patch-ext__rack__config.ru')
| -rw-r--r-- | sysutils/puppet5/files/patch-ext__rack__config.ru | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sysutils/puppet5/files/patch-ext__rack__config.ru b/sysutils/puppet5/files/patch-ext__rack__config.ru new file mode 100644 index 000000000000..51facb111557 --- /dev/null +++ b/sysutils/puppet5/files/patch-ext__rack__config.ru @@ -0,0 +1,19 @@ +--- 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 |