diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-08 23:57:56 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-08 23:57:56 +0000 |
| commit | 8a7fe9fedfcf67f9415a2ecf7fd74f6032d39d8b (patch) | |
| tree | 1a5dd86162e0f73c521bae74d40e1074e3e6a031 /lib/puppet | |
| parent | 4080077639321884cc633928915664e6e1391c2e (diff) | |
| download | puppet-8a7fe9fedfcf67f9415a2ecf7fd74f6032d39d8b.tar.gz puppet-8a7fe9fedfcf67f9415a2ecf7fd74f6032d39d8b.tar.xz puppet-8a7fe9fedfcf67f9415a2ecf7fd74f6032d39d8b.zip | |
Applying patch by David Schmitt from #701.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2661 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/configuration.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb index 2828559b8..d44035dda 100644 --- a/lib/puppet/configuration.rb +++ b/lib/puppet/configuration.rb @@ -339,6 +339,11 @@ module Puppet :mode => 0640, :desc => "Where the puppetd web server logs." }, + :http_proxy_host => ["none", + "The HTTP proxy host to use for outgoing connections. Note: You + may need to use a FQDN for the server hostname when using a proxy."], + :http_proxy_port => [3128, + "The HTTP proxy port to use for outgoing connections"], :server => ["puppet", "The server to which server puppetd should connect"], :ignoreschedules => [false, diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index 38f40a827..606aa0019 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -99,6 +99,13 @@ module Puppet::Network hash[:Path] ||= "/RPC2" hash[:Server] ||= Puppet[:server] hash[:Port] ||= Puppet[:masterport] + hash[:HTTPProxyHost] ||= Puppet[:http_proxy_host] + hash[:HTTPProxyPort] ||= Puppet[:http_proxy_port] + + if "none" == hash[:HTTPProxyHost] + hash[:HTTPProxyHost] = nil + hash[:HTTPProxyPort] = nil + end @puppet_server = hash[:Server] @puppet_port = hash[:Port] @@ -107,8 +114,8 @@ module Puppet::Network hash[:Server], hash[:Path], hash[:Port], - nil, # proxy_host - nil, # proxy_port + hash[:HTTPProxyHost], # proxy_host + hash[:HTTPProxyPort], # proxy_port nil, # user nil, # password true, # use_ssl |