[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[markus (none)]

The following commit has been merged in the upstream branch:
commit e32320ee2c65275e3c695c555f506a499209efa1
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Jul 27 14:40:21 2010 -0700

    [#4336] "reportdir" was in the wrong section
    
    Correctly revert damage done by c00285c, which incorrectly reverted in
    a7e4fe8.
    The result was that "puppet agent" and others were trying to create a
    reportdir that they don't actually use.

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 4bc71df..4b8004a 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -444,6 +444,15 @@ module Puppet
       in puppet/reports/name.rb, and multiple report names should be
       comma-separated (whitespace is okay)."
     ],
+    :reportdir => {:default => "$vardir/reports",
+      :mode => 0750,
+      :owner => "service",
+      :group => "service",
+      :desc => "The directory in which to store reports
+        received from the client.  Each client gets a separate
+        subdirectory."},
+    :reporturl => ["http://localhost:3000/reports",
+      "The URL used by the http reports processor to send reports"],
     :fileserverconfig => ["$confdir/fileserver.conf", "Where the fileserver configuration is stored."],
     :rrddir => {:default => "$vardir/rrd",
       :owner => "service",
@@ -622,16 +631,7 @@ module Puppet
       is used for retrieval, so anything that is a valid file source can
       be used here."],
     :factsync => [false, "Whether facts should be synced with the central server."],
-    :factsignore => [".svn CVS", "What files to ignore when pulling down facts."],
-    :reportdir => {:default => "$vardir/reports",
-      :mode => 0750,
-      :owner => "service",
-      :group => "service",
-      :desc => "The directory in which to store reports
-        received from the client.  Each client gets a separate
-        subdirectory."},
-    :reporturl => ["http://localhost:3000/reports",
-      "The URL used by the http reports processor to send reports"]
+    :factsignore => [".svn CVS", "What files to ignore when pulling down facts."]
   )
 
 

-- 
Puppet packaging for Debian