patch-ext_rack_config_ru 997 B

12345678910111213141516171819
  1. $OpenBSD: patch-ext_rack_config_ru,v 1.2 2016/04/28 13:05:31 jasper Exp $
  2. --- ext/rack/config.ru.orig Sat Apr 23 00:15:56 2016
  3. +++ ext/rack/config.ru Thu Apr 28 15:02:16 2016
  4. @@ -14,11 +14,11 @@ ARGV << "--rack"
  5. # Rack applications typically don't start as root. Set --confdir, --vardir,
  6. # --logdir, --rundir to prevent reading configuration from
  7. # ~/ based pathing.
  8. -ARGV << "--confdir" << "/etc/puppetlabs/puppet"
  9. -ARGV << "--vardir" << "/opt/puppetlabs/server/data/puppetmaster"
  10. +ARGV << "--confdir" << "${SYSCONFDIR}/puppetlabs/puppet"
  11. +ARGV << "--vardir" << "/var/puppetlabs/server/data/puppetmaster"
  12. ARGV << "--logdir" << "/var/log/puppetlabs/puppetmaster"
  13. ARGV << "--rundir" << "/var/run/puppetlabs/puppetmaster"
  14. -ARGV << "--codedir" << "/etc/puppetlabs/code"
  15. +ARGV << "--codedir" << "${SYSCONFIDR}/puppetlabs/code"
  16. # always_cache_features is a performance improvement and safe for a master to
  17. # apply. This is intended to allow agents to recognize new features that may be