blob: 7a18cd3618604b7a3e522e27e2d8f06f229784ae (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
--- puppet-0.18.0/conf/redhat/fileserver.conf.orig 2006-06-20 12:13:49.000000000 -0700
+++ puppet-0.18.0/conf/redhat/fileserver.conf 2006-06-20 12:14:03.000000000 -0700
@@ -6,7 +6,7 @@
# for allow/deny does not matter, allow always takes precedence
# over deny
[files]
- path /var/puppet/files
+ path /var/lib/puppet/files
# allow *.example.com
# deny *.evil.example.com
# allow 192.168.0.0/24
--- puppet-0.18.0/conf/redhat/puppetd.conf.orig 2006-06-20 12:12:01.000000000 -0700
+++ puppet-0.18.0/conf/redhat/puppetd.conf 2006-06-20 12:14:37.000000000 -0700
@@ -1,5 +1,33 @@
+[puppet]
+ # Where Puppet stores dynamic and growing data.
+ # The default value is '/var/puppet'.
+ vardir = /var/lib/puppet
+
+ # The Puppet log directory.
+ # The default value is '$vardir/log'.
+ logdir = /var/log/puppet
+
+ # Where Puppet PID files are kept.
+ # The default value is '$vardir/run'.
+ rundir = /var/run/puppet
+
+ # Where lock files are kept.
+ # The default value is '$vardir/locks'.
+ lockdir = /var/lock
+
+ # Where SSL certificates are kept.
+ # The default value is '$confdir/ssl'.
+ ssldir = $vardir/ssl
+
[puppetd]
-# Make sure all log messages are sent to the right directory
-# This directory must be writable by the puppet user
-logdir=/var/log/puppet
-rundir=/var/run
+ # The file in which puppetd stores a list of the classes
+ # associated with the retrieved configuratiion. Can be loaded in
+ # the separate ``puppet`` executable using the ``--loadclasses``
+ # option.
+ # The default value is '$confdir/classes.txt'.
+ classfile = $vardir/classes.txt
+
+ # Where puppetd caches the local configuration. An
+ # extension indicating the cache format is added automatically.
+ # The default value is '$confdir/localconfig'.
+ localconfig = $vardir/localconfig
|
