From a7e4fe8dbc3fc8d3bec5294cf68c69febb9194eb Mon Sep 17 00:00:00 2001
From: Rein Henrichs <rein@puppetlabs.com>
Date: Thu, 24 Jun 2010 14:37:33 -0700
Subject: [#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.
---
 lib/puppet/defaults.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/puppet')

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",
-- 
cgit