summaryrefslogtreecommitdiffstats
path: root/lib/puppet/defaults.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/defaults.rb')
-rw-r--r--lib/puppet/defaults.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 4b442d094..cb6e67a7b 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -494,12 +494,11 @@ module Puppet
"The server through which to send email reports."]
)
- self.setdefaults(:facts,
+ # This needs to be in main because it's used too early in the system, such that
+ # we get an infinite loop otherwise.
+ self.setdefaults(:main,
:fact_store => ["yaml",
- "The backend store to use for client facts."]
- )
-
- self.setdefaults(:yamlfacts,
+ "The backend store to use for client facts."],
:yamlfactdir => ["$vardir/facts",
"The directory in which client facts are stored when the yaml fact store is used."]
)