From e32320ee2c65275e3c695c555f506a499209efa1 Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Tue, 27 Jul 2010 14:40:21 -0700 Subject: [#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. --- lib/puppet/defaults.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/puppet/defaults.rb') diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 4bc71df7e..4b8004a0f 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."] ) -- cgit