diff options
Diffstat (limited to 'lib/puppet.rb')
-rw-r--r-- | lib/puppet.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 66a52f9e3..cde25721e 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -205,16 +205,7 @@ module Puppet end # Parse the config file for this process. - def self.parse_config(oldconfig = nil) - # First look for the old configuration file. - oldconfig ||= File.join(Puppet[:confdir], Puppet[:name].to_s + ".conf") - if FileTest.exists?(oldconfig) and Puppet[:name] != "puppet" - Puppet.warning "Individual config files are deprecated; remove %s and use puppet.conf" % oldconfig - Puppet.settings.old_parse(oldconfig) - return - end - - # Now check for the normal config. + def self.parse_config if Puppet[:config] and File.exists? Puppet[:config] Puppet.debug "Parsing %s" % Puppet[:config] Puppet.settings.parse(Puppet[:config]) |