← Back to branch summary

~ubuntu-branches/ubuntu/lucid/puppet/lucid-security

« back to all changes in this revision

Viewing changes to conf/redhat/lsb-config.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

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