summaryrefslogtreecommitdiff
path: root/sysutils/puppet5/files/patch-ext__rack__config.ru
blob: 51facb111557cd592dda234b2f4d304175406e99 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
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