diff options
Diffstat (limited to 'lib/puppet/application/master.rb')
| -rw-r--r-- | lib/puppet/application/master.rb | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb index 7ea3f3a83..7485dcb3f 100644 --- a/lib/puppet/application/master.rb +++ b/lib/puppet/application/master.rb @@ -20,9 +20,7 @@ class Puppet::Application::Master < Puppet::Application Puppet::Util::Log.newdestination(arg) options[:setdest] = true rescue => detail - if Puppet[:debug] - puts detail.backtrace - end + puts detail.backtrace if Puppet[:debug] $stderr.puts detail.to_s end end @@ -82,18 +80,14 @@ class Puppet::Application::Master < Puppet::Application xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :Filebucket] - if Puppet[:ca] - xmlrpc_handlers << :CA - end + xmlrpc_handlers << :CA if Puppet[:ca] # Make sure we've got a localhost ssl cert Puppet::SSL::Host.localhost # And now configure our server to *only* hit the CA for data, because that's # all it will have write access to. - if Puppet::SSL::CertificateAuthority.ca? - Puppet::SSL::Host.ca_location = :only - end + Puppet::SSL::Host.ca_location = :only if Puppet::SSL::CertificateAuthority.ca? if Puppet.features.root? begin @@ -138,13 +132,9 @@ class Puppet::Application::Master < Puppet::Application end end - unless options[:setdest] - Puppet::Util::Log.newdestination(:syslog) - end + Puppet::Util::Log.newdestination(:syslog) unless options[:setdest] - if Puppet.settings.print_configs? - exit(Puppet.settings.print_configs ? 0 : 1) - end + exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs? Puppet.settings.use :main, :master, :ssl |