summaryrefslogtreecommitdiffstats
path: root/lib/puppet/configuration.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/configuration.rb')
-rw-r--r--lib/puppet/configuration.rb5
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,