diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-06-24 14:37:33 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-24 15:59:12 -0700 |
| commit | a7e4fe8dbc3fc8d3bec5294cf68c69febb9194eb (patch) | |
| tree | 3eee6ae21f68d6ed63d3fdd0deedf35582a06282 | |
| parent | db44a32695ae2b1249461f187b4b3321c24cfd84 (diff) | |
| download | puppet-a7e4fe8dbc3fc8d3bec5294cf68c69febb9194eb.tar.gz puppet-a7e4fe8dbc3fc8d3bec5294cf68c69febb9194eb.tar.xz puppet-a7e4fe8dbc3fc8d3bec5294cf68c69febb9194eb.zip | |
[#3810] Do not create a reports settings block
Puts reportdir and reporturl back in the "main" block because this makes
tests break for reasons I don't understand.
| -rw-r--r-- | lib/puppet/defaults.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index bba2bf260..732d3ead1 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -627,10 +627,7 @@ module Puppet :factsync => [false, "Whether facts should be synced with the central server."], :factsignore => [".svn CVS", - "What files to ignore when pulling down facts."] - ) - - setdefaults :reports, + "What files to ignore when pulling down facts."], :reportdir => {:default => "$vardir/reports", :mode => 0750, :owner => "service", @@ -640,6 +637,7 @@ module Puppet subdirectory."}, :reporturl => ["http://localhost:3000/reports", "The URL used by the http reports processor to send reports"] + ) setdefaults(:tagmail, :tagmap => ["$confdir/tagmail.conf", |