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/application | |
| 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/application')
| -rw-r--r-- | lib/puppet/application/agent.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/application/master.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index e8ed04079..609a4580a 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -233,7 +233,7 @@ class Puppet::Application::Agent < Puppet::Application Puppet::Util::Log.newdestination(logdest) end - Puppet.settings.use :main, :puppetd, :ssl + Puppet.settings.use :main, :agent, :ssl # We need to specify a ca location for all of the SSL-related i # indirected classes to work; in fingerprint mode we just need diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb index 17ff5de53..433a4d2f2 100644 --- a/lib/puppet/application/master.rb +++ b/lib/puppet/application/master.rb @@ -146,7 +146,7 @@ class Puppet::Application::Master < Puppet::Application exit(Puppet.settings.print_configs ? 0 : 1) end - Puppet.settings.use :main, :puppetmasterd, :ssl + Puppet.settings.use :main, :master, :ssl # A temporary solution, to at least make the master work for now. Puppet::Node::Facts.terminus_class = :yaml |