diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-15 16:43:27 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 71033786bf4abef4fd486793d6fe186fff87a432 (patch) | |
| tree | f7114c6c417b2bcce7e431b5018a5e0edff8df2d /lib | |
| parent | 54c1cc5dc9f8994378c850474b8fd468300fb0e8 (diff) | |
| download | puppet-71033786bf4abef4fd486793d6fe186fff87a432.tar.gz puppet-71033786bf4abef4fd486793d6fe186fff87a432.tar.xz puppet-71033786bf4abef4fd486793d6fe186fff87a432.zip | |
feature #2276 Single Executable: legacy settings
Puppet's defaults change depending on which command invokes them.
This patch makes sure that we use the maintain the current behavior.
This is a temporary fix until I implement feature #2935.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/defaults.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 1f5e0eda4..a9cb48419 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -4,7 +4,20 @@ module Puppet # use basedirs that are in the user's home directory. conf = nil var = nil - name = $0.gsub(/.+#{File::SEPARATOR}/,'').sub(/\.rb$/, '') + + legacy_name = Hash.new{ |h,k| k }.update({ + 'agent' => 'puppetd', + 'cert' => 'puppetca', + 'doc' => 'puppetdoc', + 'filebucket' => 'filebucket', + 'apply' => 'puppet', + 'describe' => 'pi', + 'queue' => 'puppetqd', + 'resource' => 'ralsh', + 'kick' => 'puppetrun', + 'master' => 'puppetmasterd', + }) + name = legacy_name[ $puppet_subcommand_name ] || $0.gsub(/.+#{File::SEPARATOR}/,'').sub(/\.rb$/, '') # Make File.expand_path happy require 'etc' |