diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-09 10:50:07 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-09 10:50:07 -0500 |
| commit | afa1dee5eb3a8b5249715e61f9894b04ab34a6ae (patch) | |
| tree | 71f3d553f38a1f3c873038dcd26d2376064ee6b6 /lib/puppet/defaults.rb | |
| parent | 275af562b462813ddf5ddbad2192ddc2bf57770c (diff) | |
| parent | 1befcc46926a27ec5f799d6ad8caa59c3b808c4c (diff) | |
| download | puppet-afa1dee5eb3a8b5249715e61f9894b04ab34a6ae.tar.gz puppet-afa1dee5eb3a8b5249715e61f9894b04ab34a6ae.tar.xz puppet-afa1dee5eb3a8b5249715e61f9894b04ab34a6ae.zip | |
Merge branch 'routing' of http://git.rickbradley.com/puppet into routing
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 1b0b402ec..6ea4eef4c 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -500,15 +500,6 @@ module Puppet "The server through which to send email reports."] ) - # 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, - :facts_terminus => ["yaml", - "The backend store to use for client facts."], - :checksum_terminus => ["file", - "The backend store to use for storing files by checksum (i.e., filebuckets)."] - ) - self.setdefaults(:rails, :dblocation => { :default => "$statedir/clientconfigs.sqlite3", :mode => 0660, |