diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-19 17:37:51 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | f9783fcdee928c80339b2b1567350b2450e1ea05 (patch) | |
| tree | 4d2c54a850d53da5b5e3eae84d50857323bf2069 /lib | |
| parent | 1d8bd0d9308413b2f0772a65ee76d69d8fa5959b (diff) | |
| download | puppet-f9783fcdee928c80339b2b1567350b2450e1ea05.tar.gz puppet-f9783fcdee928c80339b2b1567350b2450e1ea05.tar.xz puppet-f9783fcdee928c80339b2b1567350b2450e1ea05.zip | |
feature #2276 Single Executable: "puppet master"
Add "puppet master" as the new invocation of "puppetmasterd"
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/master.rb (renamed from lib/puppet/application/server.rb) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/server.rb b/lib/puppet/application/master.rb index 7aeb6ad5d..8f1c0cd95 100644 --- a/lib/puppet/application/server.rb +++ b/lib/puppet/application/master.rb @@ -4,7 +4,7 @@ require 'puppet/daemon' require 'puppet/network/server' require 'puppet/network/http/rack' if Puppet.features.rack? -Puppet::Application.new(:server) do +Puppet::Application.new(:master) do should_parse_config @@ -115,7 +115,7 @@ Puppet::Application.new(:server) do @app = Puppet::Network::HTTP::Rack.new(:xmlrpc_handlers => xmlrpc_handlers, :protocols => [:rest, :xmlrpc]) end - Puppet.notice "Starting Puppet server version %s" % [Puppet.version] + Puppet.notice "Starting Puppet master version %s" % [Puppet.version] unless options[:rack] @daemon.start |