diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 14:40:21 -0700 |
---|---|---|
committer | markus <markus@AVA-351181.(none)> | 2010-08-03 15:19:30 -0700 |
commit | e32320ee2c65275e3c695c555f506a499209efa1 (patch) | |
tree | 33d38d3f6449de273a725efc69179beaee6a98cc /lib/puppet/defaults.rb | |
parent | 0f9672a545ac057282b9add87ee602e3200d11de (diff) | |
download | puppet-e32320ee2c65275e3c695c555f506a499209efa1.tar.gz puppet-e32320ee2c65275e3c695c555f506a499209efa1.tar.xz puppet-e32320ee2c65275e3c695c555f506a499209efa1.zip |
[#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.
Diffstat (limited to 'lib/puppet/defaults.rb')
-rw-r--r-- | lib/puppet/defaults.rb | 20 |
1 files changed, 10 insertions, 10 deletions
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."] ) |