From b36f9c9a53bb568c7f72a81dfb75cee9f16e66d1 Mon Sep 17 00:00:00 2001 From: luke Date: Thu, 8 Mar 2007 16:53:45 +0000 Subject: Fixing the config path to use Puppet[:name] rather than Puppet.name git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2271 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb index e4e1a6ec6..7c66cc11e 100644 --- a/lib/puppet/configuration.rb +++ b/lib/puppet/configuration.rb @@ -116,8 +116,8 @@ module Puppet # Define the config default. self.setdefaults(self.name, - :config => ["$confdir/#{self.name}.conf", - "The configuration file for #{self.name}."], + :config => ["$confdir/#{Puppet[:name]}.conf", + "The configuration file for #{Puppet[:name]}."], :pidfile => ["", "The pid file"], :bindaddress => ["", "The address to bind to. Mongrel servers default to 127.0.0.1 and WEBrick defaults to 0.0.0.0."], -- cgit