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/configuration.rb | |
| 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/configuration.rb')
| -rw-r--r-- | lib/puppet/configuration.rb | 5 |
1 files changed, 5 insertions, 0 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, |