summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-08-28 17:00:32 -0500
committerLuke Kanies <luke@madstop.com>2007-08-28 17:00:32 -0500
commit62806bb8749d001354078f176fad8a0a54316efb (patch)
tree80b66d87e37737026edacc09d870036a383bc27e
parent6832a4b08ecddbe017cc6393bc02cb448e607b1b (diff)
downloadpuppet-62806bb8749d001354078f176fad8a0a54316efb.tar.gz
puppet-62806bb8749d001354078f176fad8a0a54316efb.tar.xz
puppet-62806bb8749d001354078f176fad8a0a54316efb.zip
Renaming the file containing all of the configuration defaults to "defaults.rb", since I am going to create a separate "configuration" top-level directory to contain all of the classes related to managing the configuration for a given node.
-rw-r--r--lib/puppet.rb2
-rw-r--r--lib/puppet/defaults.rb (renamed from lib/puppet/configuration.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index b11f81d49..b9a09bb49 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -115,7 +115,7 @@ module Puppet
end
# Load all of the configuration parameters.
- require 'puppet/configuration'
+ require 'puppet/defaults'
def self.genconfig
if Puppet[:configprint] != ""
diff --git a/lib/puppet/configuration.rb b/lib/puppet/defaults.rb
index 78364e786..78364e786 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/defaults.rb