summaryrefslogtreecommitdiffstats
path: root/lib/puppet/module.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-09-22 17:54:46 -0500
committerLuke Kanies <luke@madstop.com>2007-09-22 17:54:46 -0500
commit3a18348fdbea39f56857b03c8f531bd5a2a8105d (patch)
treef305e24aee683167f45f962e5fcdfe524d59d93e /lib/puppet/module.rb
parente552c83b2875dab60a5508bfae352e7aa9235746 (diff)
downloadpuppet-3a18348fdbea39f56857b03c8f531bd5a2a8105d.tar.gz
puppet-3a18348fdbea39f56857b03c8f531bd5a2a8105d.tar.xz
puppet-3a18348fdbea39f56857b03c8f531bd5a2a8105d.zip
Renaming the 'Puppet::Util::Config' class to
'Puppet::Util::Settings'. This is to clear up confusion caused by the fact that we now have a 'Configuration' class to model host configurations, or any set of resources as a "configuration".
Diffstat (limited to 'lib/puppet/module.rb')
-rw-r--r--lib/puppet/module.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb
index 924958bbe..dc30d8167 100644
--- a/lib/puppet/module.rb
+++ b/lib/puppet/module.rb
@@ -9,7 +9,7 @@ class Puppet::Module
# parameter. Only consider paths that are absolute and existing
# directories
def self.modulepath(environment = nil)
- dirs = Puppet.config.value(:modulepath, environment).split(":")
+ dirs = Puppet.settings.value(:modulepath, environment).split(":")
if ENV["PUPPETLIB"]
dirs = ENV["PUPPETLIB"].split(":") + dirs
else
@@ -61,7 +61,7 @@ class Puppet::Module
if mod
return mod.template(file)
else
- return File.join(Puppet.config.value(:templatedir, environment), template)
+ return File.join(Puppet.settings.value(:templatedir, environment), template)
end
end