diff options
| -rw-r--r-- | lib/puppet/defaults.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index da3aaa37e..5ed438da1 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -353,7 +353,7 @@ module Puppet ) # Define the config default. - self.setdefaults(self.settings[:name], + setdefaults(Puppet.settings[:name], :config => ["$confdir/puppet.conf", "The configuration file for #{Puppet[:name]}."], :pidfile => ["$rundir/$name.pid", "The pid file"], @@ -368,7 +368,7 @@ module Puppet } ) - self.setdefaults(:master, + setdefaults(:master, :user => ["puppet", "The user puppet master should run as."], :group => ["puppet", "The group puppet master should run as."], :manifestdir => ["$confdir/manifests", @@ -594,7 +594,7 @@ module Puppet ) # Plugin information. - self.setdefaults(:main, + setdefaults(:main, :plugindest => ["$libdir", "Where Puppet should store plugins that it pulls down from the central server."], @@ -609,7 +609,7 @@ module Puppet ) # Central fact information. - self.setdefaults(:main, + setdefaults(:main, :factpath => {:default => "$vardir/lib/facter/:$vardir/facts", :desc => "Where Puppet should look for facts. Multiple directories should be colon-separated, like normal PATH variables.", @@ -629,7 +629,7 @@ module Puppet "What files to ignore when pulling down facts."] ) - self.setdefaults(:tagmail, + setdefaults(:tagmail, :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags and email addresses."], :sendmail => [%x{which sendmail 2>/dev/null}.chomp, @@ -640,7 +640,7 @@ module Puppet "The server through which to send email reports."] ) - self.setdefaults(:rails, + setdefaults(:rails, :dblocation => { :default => "$statedir/clientconfigs.sqlite3", :mode => 0660, :owner => "service", |