From ac7efc8f0284d6b35f5428da06ba371cf94998ec Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Wed, 12 May 2010 18:25:14 -0700 Subject: Feature #2935 Puppet::Mode#master? Use a predicate function on the Mode object instead of comparing with the executable name everywhere Signed-off-by: Jesse Wolfe --- lib/puppet/network/authorization.rb | 3 +-- lib/puppet/network/http/webrick.rb | 2 +- lib/puppet/network/http_server/webrick.rb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/puppet/network') diff --git a/lib/puppet/network/authorization.rb b/lib/puppet/network/authorization.rb index 9ea4bf69e..7a61ab9b9 100644 --- a/lib/puppet/network/authorization.rb +++ b/lib/puppet/network/authorization.rb @@ -34,8 +34,7 @@ module Puppet::Network return false end else - # This is a hack way of seeing if we're a config master. - if Puppet[:name] == "puppetmasterd" + if Puppet.mode.master? Puppet.debug "Allowing " + msg return true else diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb index 1a3f5ddce..a97add0c0 100644 --- a/lib/puppet/network/http/webrick.rb +++ b/lib/puppet/network/http/webrick.rb @@ -70,7 +70,7 @@ class Puppet::Network::HTTP::WEBrick # Make sure the settings are all ready for us. Puppet.settings.use(:main, :ssl, Puppet[:name]) - if Puppet[:name] == "puppetmasterd" + if Puppet.mode.master? file = Puppet[:masterhttplog] else file = Puppet[:httplog] diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb index 051a35234..aa930681b 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -45,7 +45,7 @@ module Puppet # yuck; separate http logs file = nil Puppet.settings.use(:main, :ssl, Puppet[:name]) - if Puppet[:name] == "puppetmasterd" + if Puppet.mode.master? file = Puppet[:masterhttplog] else file = Puppet[:httplog] -- cgit