diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-05-12 18:16:29 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | fc2904955ca6e77bda8719671df200e0811c38cd (patch) | |
| tree | bf8b3c461e0bb7f406cabd0e2420e675df5bcfd4 /lib/puppet/defaults.rb | |
| parent | 631552c58c9658780d0618c6b2fdfdc5a95465ea (diff) | |
| download | puppet-fc2904955ca6e77bda8719671df200e0811c38cd.tar.gz puppet-fc2904955ca6e77bda8719671df200e0811c38cd.tar.xz puppet-fc2904955ca6e77bda8719671df200e0811c38cd.zip | |
feature #2276 Single Executable: use new names for settings sections
The puppet-internal settings sections aren't actually exposed to the
user, but to reduce confusion I've renamed them to be consistent with
the single-executable application names.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 992b218c5..9efa99cb2 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -368,7 +368,7 @@ module Puppet } ) - self.setdefaults(:puppetmasterd, + self.setdefaults(:master, :user => ["puppet", "The user puppetmasterd should run as."], :group => ["puppet", "The group puppetmasterd should run as."], :manifestdir => ["$confdir/manifests", @@ -458,7 +458,7 @@ module Puppet in the catalogs."] ) - self.setdefaults(:puppetd, + setdefaults(:agent, :localconfig => { :default => "$statedir/localconfig", :owner => "root", :mode => 0660, @@ -742,7 +742,7 @@ module Puppet branch under your main directory."] ) - setdefaults(:puppetmasterd, + setdefaults(:master, :storeconfigs => {:default => false, :desc => "Whether to store each client's configuration. This requires ActiveRecord from Ruby on Rails.", :call_on_define => true, # Call our hook with the default value, so we always get the libdir set. |